diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29eb22f..842cded 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+* 'module' has been replaced with 'jsnext:main' to support both rollup and webpack 2
 
 ## [3.0.2]
 ### Changed
diff --git a/package.json b/package.json
index 23b385c..50331c7 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
   "homepage": "https://github.com/gf3/moment-range",
   "bugs": "https://github.com/gf3/moment-range/issues",
   "main": "./dist/moment-range",
-  "module": "lib/moment-range.js",
+  "jsnext:main": "lib/moment-range.js",
   "version": "3.0.2",
   "engines": {
     "node": "*"