diff --git a/website/package.json b/website/package.json
index 5e7d4c17d..587e54060 100644
--- a/website/package.json
+++ b/website/package.json
@@ -12,7 +12,7 @@
     "mkdirp": "latest",
     "optimist": "0.6.0",
     "react": "~0.12.0",
-    "react-docgen": "^1.1.0",
+    "react-docgen": "^2.0.1",
     "react-page-middleware": "git://github.com/facebook/react-page-middleware.git",
     "request": "latest"
   }
diff --git a/website/server/docgenHelpers.js b/website/server/docgenHelpers.js
index 609a88eb0..ff499b8c3 100644
--- a/website/server/docgenHelpers.js
+++ b/website/server/docgenHelpers.js
@@ -3,7 +3,7 @@ var b = require('react-docgen/node_modules/recast').types.builders;
 var docgen = require('react-docgen');
 
 function stylePropTypeHandler(documentation, path) {
-  var propTypesPath = docgen.utils.getPropertyValuePath(path, 'propTypes');
+  var propTypesPath = docgen.utils.getMemberValuePath(path, 'propTypes');
   if (!propTypesPath) {
     return;
   }
@@ -36,8 +36,8 @@ function stylePropTypeHandler(documentation, path) {
 }
 
 function findExportedOrFirst(node, recast) {
-  return docgen.resolver.findExportedReactCreateClassCall(node, recast) ||
-    docgen.resolver.findAllReactCreateClassCalls(node, recast)[0];
+  return docgen.resolver.findExportedComponentDefinition(node, recast) ||
+    docgen.resolver.findAllComponentDefinitions(node, recast)[0];
 }
 
 function findExportedObject(ast, recast) {
diff --git a/website/server/extractDocs.js b/website/server/extractDocs.js
index 52e751e9d..0e609a255 100644
--- a/website/server/extractDocs.js
+++ b/website/server/extractDocs.js
@@ -165,8 +165,10 @@ var components = [
   '../Libraries/CustomComponents/ListView/ListView.js',
   '../Libraries/Components/MapView/MapView.js',
   '../Libraries/CustomComponents/Navigator/Navigator.js',
+  '../Libraries/Modal/Modal.js',
   '../Libraries/Components/Navigation/NavigatorIOS.ios.js',
   '../Libraries/Picker/PickerIOS.ios.js',
+  '../Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js',
   '../Libraries/Components/ScrollView/ScrollView.js',
   '../Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js',
   '../Libraries/Components/SliderIOS/SliderIOS.ios.js',