diff --git a/npm-react/addons.js b/npm-react/addons.js
index 21c5f83950..71b7977c8f 100644
--- a/npm-react/addons.js
+++ b/npm-react/addons.js
@@ -1 +1,8 @@
+var warning = require('./lib/warning');
+warning(
+  false,
+  'require("react/addons") is deprecated. ' +
+  'Access using require("react/addons/{addon}") instead.'
+);
+
 module.exports = require('./lib/ReactWithAddons');
diff --git a/npm-react/addons/CSSTransitionGroup.js b/npm-react/addons/CSSTransitionGroup.js
new file mode 100644
index 0000000000..78174a8fa8
--- /dev/null
+++ b/npm-react/addons/CSSTransitionGroup.js
@@ -0,0 +1 @@
+module.exports = require('../lib/ReactCSSTransitionGroup');
diff --git a/npm-react/addons/LinkedStateMixin.js b/npm-react/addons/LinkedStateMixin.js
new file mode 100644
index 0000000000..907bc2ac4a
--- /dev/null
+++ b/npm-react/addons/LinkedStateMixin.js
@@ -0,0 +1 @@
+module.exports = require('../lib/LinkedStateMixin');
diff --git a/npm-react/addons/Perf.js b/npm-react/addons/Perf.js
new file mode 100644
index 0000000000..ab1b17c199
--- /dev/null
+++ b/npm-react/addons/Perf.js
@@ -0,0 +1 @@
+module.exports = require('../lib/ReactDefaultPerf');
diff --git a/npm-react/addons/PureRenderMixin.js b/npm-react/addons/PureRenderMixin.js
new file mode 100644
index 0000000000..2d3abae2d0
--- /dev/null
+++ b/npm-react/addons/PureRenderMixin.js
@@ -0,0 +1 @@
+module.exports = require('../lib/ReactComponentWithPureRenderMixin');
diff --git a/npm-react/addons/TestUtils.js b/npm-react/addons/TestUtils.js
new file mode 100644
index 0000000000..39d4c0e0eb
--- /dev/null
+++ b/npm-react/addons/TestUtils.js
@@ -0,0 +1 @@
+module.exports = require('../lib/ReactTestUtils');
diff --git a/npm-react/addons/TransitionGroup.js b/npm-react/addons/TransitionGroup.js
new file mode 100644
index 0000000000..b500e83b2d
--- /dev/null
+++ b/npm-react/addons/TransitionGroup.js
@@ -0,0 +1 @@
+module.exports = require('../lib/ReactTransitionGroup');
diff --git a/npm-react/addons/batchedUpdates.js b/npm-react/addons/batchedUpdates.js
new file mode 100644
index 0000000000..ec519c29de
--- /dev/null
+++ b/npm-react/addons/batchedUpdates.js
@@ -0,0 +1 @@
+module.exports = require('../lib/ReactUpdates').batchedUpdates;
diff --git a/npm-react/addons/cloneWithProps.js b/npm-react/addons/cloneWithProps.js
new file mode 100644
index 0000000000..86490f60d9
--- /dev/null
+++ b/npm-react/addons/cloneWithProps.js
@@ -0,0 +1 @@
+module.exports = require('../lib/cloneWithProps');
diff --git a/npm-react/addons/createFragment.js b/npm-react/addons/createFragment.js
new file mode 100644
index 0000000000..2eaa3be793
--- /dev/null
+++ b/npm-react/addons/createFragment.js
@@ -0,0 +1 @@
+module.exports = require('../lib/ReactFragment').create;
diff --git a/npm-react/addons/renderSubtreeIntoContainer.js b/npm-react/addons/renderSubtreeIntoContainer.js
new file mode 100644
index 0000000000..a03c55ff58
--- /dev/null
+++ b/npm-react/addons/renderSubtreeIntoContainer.js
@@ -0,0 +1 @@
+module.exports = require('../lib/renderSubtreeIntoContainer');
diff --git a/npm-react/addons/shallowCompare.js b/npm-react/addons/shallowCompare.js
new file mode 100644
index 0000000000..20f10b626d
--- /dev/null
+++ b/npm-react/addons/shallowCompare.js
@@ -0,0 +1 @@
+module.exports = require('../lib/shallowCompare');
diff --git a/npm-react/addons/update.js b/npm-react/addons/update.js
new file mode 100644
index 0000000000..9f01db55c2
--- /dev/null
+++ b/npm-react/addons/update.js
@@ -0,0 +1 @@
+module.exports = require('../lib/update');
diff --git a/npm-react/package.json b/npm-react/package.json
index 3a9a368335..a1b113f1c3 100644
--- a/npm-react/package.json
+++ b/npm-react/package.json
@@ -11,6 +11,7 @@
   "files": [
     "addons.js",
     "react.js",
+    "addons/",
     "dist/",
     "lib/"
   ],