diff --git a/CHANGES.md b/CHANGES.md
index 22bbed2ba5..9691d75ff7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,9 @@
 ## [HEAD]
 
+### Distribute ES6/ES2015 modules for Rollup optimization
+
+See the [Rollup repo](https://github.com/rollup/rollup#a-next-generation-es6-module-bundler) for more details
+
 ## [v1.1.0]
 
 ### Router `onUpdate` prop
diff --git a/README.md b/README.md
index 2de0eb499b..93b6156c4b 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ Using [npm](https://www.npmjs.com/):
 
 Note that you need to also install the [history](https://www.npmjs.com/package/history) package since it is a peer dependency of React Router and won't automatically be installed for you in npm 3+.
 
-Then with a module bundler like [webpack](https://webpack.github.io/), use as you would anything else:
+Then with a module bundler like [webpack](https://webpack.github.io/) or [rollup](https://github.com/rollup/rollup), use as you would anything else:
 
 ```js
 // using an ES6 transpiler, like babel
diff --git a/package.json b/package.json
index 524a0367f6..cbb47ce051 100644
--- a/package.json
+++ b/package.json
@@ -6,10 +6,12 @@
     "*.md",
     "docs",
     "lib",
+    "modules",
     "npm-scripts",
     "umd"
   ],
   "main": "lib/index",
+  "jsnext:main": "modules/index",
   "repository": {
     "type": "git",
     "url": "https://github.com/rackt/react-router.git"