diff --git a/package.json b/package.json
index 2b7b1be..7926106 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,8 @@
     "type": "git",
     "url": "git://github.com/TehShrike/deepmerge.git"
   },
-  "main": "dist/cjs.js",
+  "main": "dist/deepmerge.cjs.js",
+  "module": "dist/deepmerge.esm.js",
   "engines": {
     "node": ">=0.10.0"
   },
diff --git a/rollup.config.js b/rollup.config.js
index 8323ab2..4695836 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -10,12 +10,18 @@ export default {
 	],
 	output: [
 		{
+			name: 'deepmerge',
 			file: pkg.main,
 			format: `cjs`
 		},
 		{
 			name: 'deepmerge',
-			file: 'dist/umd.js',
+			file: pkg.module,
+			format: `es`
+		},
+		{
+			name: 'deepmerge',
+			file: 'dist/deepmerge.umd.js',
 			format: `umd`
 		},
 	],