diff --git a/package.json b/package.json
index 6eae4d26624..d9a5ef7465f 100644
--- a/package.json
+++ b/package.json
@@ -79,6 +79,9 @@
     "lint-staged": "6.1.0",
     "pre-commit": "1.2.2",
     "prettier": "1.11.1",
+    "rollup-plugin-local-resolve": "^1.0.7",
+    "rollup-plugin-node-resolve": "^3.0.3",
+    "rollup-plugin-sourcemaps": "^0.4.2",
     "ts-jest": "20.0.14",
     "typescript": "2.5.2"
   }
diff --git a/packages/apollo-cache/rollup.config.js b/packages/apollo-cache/rollup.config.js
index bf619ce2ae6..cf23f1ec4cc 100644
--- a/packages/apollo-cache/rollup.config.js
+++ b/packages/apollo-cache/rollup.config.js
@@ -2,9 +2,6 @@ import resolve from 'rollup-plugin-node-resolve';
 
 import build from '../../rollup.config';
 
-export default Object.assign(
-  {
-    plugins: [resolve()],
-  },
-  build('apollo.cache.core'),
-);
+export default build('apollo.cache.core', {
+  plugins: [resolve()],
+});
diff --git a/rollup.config.js b/rollup.config.js
index 4f747155502..c68ca8b919a 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -1,3 +1,5 @@
+import sourcemaps from 'rollup-plugin-sourcemaps';
+
 export const globals = {
   // Apollo
   'apollo-client': 'apollo.core',
@@ -8,24 +10,34 @@ export const globals = {
   'graphql-anywhere': 'graphqlAnywhere',
 };
 
-export default (name, override = {}) =>
-  Object.assign(
+export default (name, override = {}) => {
+  const config = Object.assign(
     {
       input: 'lib/index.js',
-      output: {
-        file: 'lib/bundle.umd.js',
-        format: 'umd',
-      },
+      //output: merged separately
+      onwarn,
+      external: Object.keys(globals),
+    },
+    override,
+  );
+
+  config.output = Object.assign(
+    {
+      file: 'lib/bundle.umd.js',
+      format: 'umd',
       name,
       exports: 'named',
       sourcemap: true,
-      external: Object.keys(globals),
-      onwarn,
       globals,
     },
-    override,
+    config.output,
   );
 
+  config.plugins = config.plugins || [];
+  config.plugins.push(sourcemaps());
+  return config;
+};
+
 function onwarn(message) {
   const suppressed = ['UNRESOLVED_IMPORT', 'THIS_IS_UNDEFINED'];