diff --git a/package.json b/package.json
index 494b68f..148bcec 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,8 @@
     "build:es": "babel src --out-dir lib && mv lib/index.js lib/react-popper.js",
     "build:umd": "rollup -c --output.format umd --output.name ReactPopper --output.file dist/react-popper.umd.js",
     "build:cjs": "rollup -c --output.format cjs --output.name ReactPopper --output.file dist/react-popper.js",
-    "build:umd-min": "MINIFY=true rollup -c --output.format umd --output.name ReactPopper --output.file dist/react-popper.umd.min.js",
-    "build:cjs-min": "MINIFY=true rollup -c --output.format cjs --output.name ReactPopper --output.file dist/react-popper.min.js",
+    "build:umd-min": "NODE_ENV=production rollup -c --output.format umd --output.name ReactPopper --output.file dist/react-popper.umd.min.js",
+    "build:cjs-min": "NODE_ENV=production rollup -c --output.format cjs --output.name ReactPopper --output.file dist/react-popper.min.js",
     "demo": "parcel --out-dir demo/dist demo/index.html",
     "prepare": "npm run build",
     "precommit": "lint-staged",
diff --git a/rollup.config.js b/rollup.config.js
index 163b696..1d40729 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -1,20 +1,34 @@
 import babel from 'rollup-plugin-babel';
 import minify from 'rollup-plugin-babel-minify';
+import replace from 'rollup-plugin-replace';
+import nodeResolve from 'rollup-plugin-node-resolve';
 
 export default {
   input: 'src/index.js',
   plugins: [
+    nodeResolve(),
     babel({
       babelrc: false,
       presets: [['env', { modules: false }], 'stage-2', 'react'],
       plugins: [
         'external-helpers',
-        ['transform-react-remove-prop-types', { mode: 'wrap' }],
       ],
+      env: {
+        production: {
+          plugins: [
+            ['transform-react-remove-prop-types', { removeImport: true }],
+          ],
+        },
+      },
     }),
-    process.env.MINIFY ? minify() : false,
+    replace({
+      'process.env.NODE_ENV': JSON.stringify('production')
+    }),
+    process.env.NODE_ENV === 'production' ? minify({
+      comments: false,
+    }) : false,
   ].filter(Boolean),
-  external: ['react', 'react-dom', 'prop-types', 'popper.js'],
+  external: ['react', 'react-dom', 'prop-types'],
   output: {
     sourcemap: true,
     globals: {