diff --git a/Examples/UIExplorer/TextExample.ios.js b/Examples/UIExplorer/TextExample.ios.js
index b2fd717add..ebc67b6720 100644
--- a/Examples/UIExplorer/TextExample.ios.js
+++ b/Examples/UIExplorer/TextExample.ios.js
@@ -215,6 +215,11 @@ exports.examples = [
         <Text style={{textAlign: 'right'}}>
           right right right right right right right right right right right right right
         </Text>
+        <Text style={{textAlign: 'justify'}}>
+          justify: this text component's contents are laid out with "textAlign: justify"
+          and as you can see all of the lines except the last one span the
+          available width of the parent container.
+        </Text>
       </View>
     );
   },
diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp.ios/testTextExampleSnapshot_1@2x.png b/Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp.ios/testTextExampleSnapshot_1@2x.png
index f869159a2c..f37869de39 100644
Binary files a/Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp.ios/testTextExampleSnapshot_1@2x.png and b/Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp.ios/testTextExampleSnapshot_1@2x.png differ
diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerIntegrationTests.m b/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerIntegrationTests.m
index c1c5e5737c..8ee4244252 100644
--- a/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerIntegrationTests.m
+++ b/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerIntegrationTests.m
@@ -42,7 +42,7 @@
   _runner = RCTInitRunnerForApp(@"Examples/UIExplorer/UIExplorerApp.ios");
 
   // If tests have changes, set recordMode = YES below and run the affected
-  // tests on an iPhone5, iOS 8.1 simulator.
+  // tests on an iPhone5, iOS 8.3 simulator.
   _runner.recordMode = NO;
 }
 
diff --git a/Libraries/Text/TextStylePropTypes.js b/Libraries/Text/TextStylePropTypes.js
index 95a0f4cb89..450d26f337 100644
--- a/Libraries/Text/TextStylePropTypes.js
+++ b/Libraries/Text/TextStylePropTypes.js
@@ -26,8 +26,9 @@ var TextStylePropTypes = Object.assign(Object.create(ViewStylePropTypes), {
   lineHeight: ReactPropTypes.number,
   color: ReactPropTypes.string,
   containerBackgroundColor: ReactPropTypes.string,
+  // NOTE: "justify" is supported only on iOS
   textAlign: ReactPropTypes.oneOf(
-    ['auto' /*default*/, 'left', 'right', 'center']
+    ['auto' /*default*/, 'left', 'right', 'center', 'justify']
   ),
   writingDirection: ReactPropTypes.oneOf(
     ['auto' /*default*/, 'ltr', 'rtl']