diff --git a/Libraries/StyleSheet/LayoutPropTypes.js b/Libraries/StyleSheet/LayoutPropTypes.js
index 2d4f99319..95bb430a8 100644
--- a/Libraries/StyleSheet/LayoutPropTypes.js
+++ b/Libraries/StyleSheet/LayoutPropTypes.js
@@ -311,7 +311,8 @@ var LayoutPropTypes = {
     'flex-start',
     'flex-end',
     'center',
-    'stretch'
+    'stretch',
+    'baseline'
   ]),
 
   /** `alignSelf` controls how a child aligns in the cross direction,
@@ -325,7 +326,8 @@ var LayoutPropTypes = {
     'flex-start',
     'flex-end',
     'center',
-    'stretch'
+    'stretch',
+    'baseline'
   ]),
 
   /** `overflow` controls how a children are measured and displayed.
diff --git a/React/Base/RCTConvert.m b/React/Base/RCTConvert.m
index 01ee6ba96..4036be600 100644
--- a/React/Base/RCTConvert.m
+++ b/React/Base/RCTConvert.m
@@ -640,7 +640,8 @@ RCT_ENUM_CONVERTER(YGAlign, (@{
   @"flex-end": @(YGAlignFlexEnd),
   @"center": @(YGAlignCenter),
   @"auto": @(YGAlignAuto),
-  @"stretch": @(YGAlignStretch)
+  @"stretch": @(YGAlignStretch),
+  @"baseline": @(YGAlignBaseline)
 }), YGAlignFlexStart, intValue)
 
 RCT_ENUM_CONVERTER(YGPositionType, (@{