diff --git a/server/build/plugins/combine-assets-plugin.js b/server/build/plugins/combine-assets-plugin.js
index 5093b051..b7bae4a4 100644
--- a/server/build/plugins/combine-assets-plugin.js
+++ b/server/build/plugins/combine-assets-plugin.js
@@ -1,3 +1,5 @@
+import { ConcatSource } from 'webpack-sources'
+
 // This plugin combines a set of assets into a single asset
 // This should be only used with text assets,
 // otherwise the result is unpredictable.
@@ -8,23 +10,28 @@ export default class CombineAssetsPlugin {
   }
 
   apply (compiler) {
-    compiler.plugin('after-compile', (compilation, callback) => {
-      let newSource = ''
-      this.input.forEach((name) => {
-        const asset = compilation.assets[name]
-        if (!asset) return
+    compiler.plugin('compilation', (compilation) => {
+      compilation.plugin('additional-chunk-assets', (chunks) => {
+        const concat = new ConcatSource()
 
-        newSource += `${asset.source()}\n`
+        this.input.forEach((name) => {
+          const asset = compilation.assets[name]
+          if (!asset) return
 
-        // We keep existing assets since that helps when analyzing the bundle
+          concat.add(asset)
+
+          // We keep existing assets since that helps when analyzing the bundle
+        })
+
+        compilation.additionalChunkAssets.push(this.output)
+        compilation.assets[this.output] = concat
+
+        // Register the combined file as an output of the associated chunks
+        chunks.filter((chunk) => {
+          return chunk.files.reduce((prev, file) => prev || this.input.includes(file), false)
+        })
+        .forEach((chunk) => chunk.files.push(this.output))
       })
-
-      compilation.assets[this.output] = {
-        source: () => newSource,
-        size: () => newSource.length
-      }
-
-      callback()
     })
   }
 }
diff --git a/server/build/plugins/dynamic-chunks-plugin.js b/server/build/plugins/dynamic-chunks-plugin.js
index 8f00a956..655d44d4 100644
--- a/server/build/plugins/dynamic-chunks-plugin.js
+++ b/server/build/plugins/dynamic-chunks-plugin.js
@@ -1,39 +1,48 @@
-export default class PagesPlugin {
-  apply (compiler) {
-    const isImportChunk = /^chunks[/\\].*\.js$/
-    const matchChunkName = /^chunks[/\\](.*)$/
+import { ConcatSource } from 'webpack-sources'
 
-    compiler.plugin('after-compile', (compilation, callback) => {
-      const chunks = Object
-        .keys(compilation.namedChunks)
-        .map(key => compilation.namedChunks[key])
-        .filter(chunk => isImportChunk.test(chunk.name))
+const isImportChunk = /^chunks[/\\].*\.js$/
+const matchChunkName = /^chunks[/\\](.*)$/
 
-      chunks.forEach((chunk) => {
-        const asset = compilation.assets[chunk.name]
-        if (!asset) return
+class DynamicChunkTemplatePlugin {
+  apply (chunkTemplate) {
+    chunkTemplate.plugin('render', function (modules, chunk) {
+      if (!isImportChunk.test(chunk.name)) {
+        return modules
+      }
 
-        const chunkName = matchChunkName.exec(chunk.name)[1]
+      const chunkName = matchChunkName.exec(chunk.name)[1]
+      const source = new ConcatSource()
 
-        const content = asset.source()
-        const newContent = `
-          window.__NEXT_REGISTER_CHUNK('${chunkName}', function() {
-            ${content}
-          })
-        `
-        // Replace the exisiting chunk with the new content
-        compilation.assets[chunk.name] = {
-          source: () => newContent,
-          size: () => newContent.length
-        }
+      source.add(`
+        __NEXT_REGISTER_CHUNK('${chunkName}', function() {
+      `)
+      source.add(modules)
+      source.add(`
+        })
+      `)
 
-        // This is to support, webpack dynamic import support with HMR
-        compilation.assets[`chunks/${chunk.id}`] = {
-          source: () => newContent,
-          size: () => newContent.length
-        }
-      })
-      callback()
+      return source
+    })
+  }
+}
+
+export default class DynamicChunksPlugin {
+  apply (compiler) {
+    compiler.plugin('compilation', (compilation) => {
+      compilation.chunkTemplate.apply(new DynamicChunkTemplatePlugin())
+
+      compilation.plugin('additional-chunk-assets', (chunks) => {
+        chunks = chunks.filter(chunk =>
+          isImportChunk.test(chunk.name) && compilation.assets[chunk.name]
+        )
+
+        chunks.forEach((chunk) => {
+          // This is to support, webpack dynamic import support with HMR
+          const copyFilename = `chunks/${chunk.name}`
+          compilation.additionalChunkAssets.push(copyFilename)
+          compilation.assets[copyFilename] = compilation.assets[chunk.name]
+        })
+      })
     })
   }
 }
diff --git a/server/build/plugins/pages-plugin.js b/server/build/plugins/pages-plugin.js
index 907630e6..87ee582c 100644
--- a/server/build/plugins/pages-plugin.js
+++ b/server/build/plugins/pages-plugin.js
@@ -1,20 +1,17 @@
+import { ConcatSource } from 'webpack-sources'
 import {
   IS_BUNDLED_PAGE,
   MATCH_ROUTE_NAME
 } from '../../utils'
 
-export default class PagesPlugin {
-  apply (compiler) {
-    compiler.plugin('after-compile', (compilation, callback) => {
-      const pages = Object
-        .keys(compilation.namedChunks)
-        .map(key => compilation.namedChunks[key])
-        .filter(chunk => IS_BUNDLED_PAGE.test(chunk.name))
+class PageChunkTemplatePlugin {
+  apply (chunkTemplate) {
+    chunkTemplate.plugin('render', function (modules, chunk) {
+      if (!IS_BUNDLED_PAGE.test(chunk.name)) {
+        return modules
+      }
 
-      pages.forEach((chunk) => {
-        const page = compilation.assets[chunk.name]
-        const pageName = MATCH_ROUTE_NAME.exec(chunk.name)[1]
-        let routeName = pageName
+      let routeName = MATCH_ROUTE_NAME.exec(chunk.name)[1]
 
         // We need to convert \ into / when we are in windows
         // to get the proper route name
@@ -22,26 +19,33 @@ export default class PagesPlugin {
         // to have "\" in the filename in unix.
         // Anyway if someone did that, he'll be having issues here.
         // But that's something we cannot avoid.
-        if (/^win/.test(process.platform)) {
-          routeName = routeName.replace(/\\/g, '/')
-        }
+      if (/^win/.test(process.platform)) {
+        routeName = routeName.replace(/\\/g, '/')
+      }
 
-        routeName = `/${routeName.replace(/(^|\/)index$/, '')}`
+      routeName = `/${routeName.replace(/(^|\/)index$/, '')}`
 
-        const content = page.source()
-        const newContent = `
-          window.__NEXT_REGISTER_PAGE('${routeName}', function() {
-            var comp = ${content}
-            return { page: comp.default }
-          })
-        `
-        // Replace the exisiting chunk with the new content
-        compilation.assets[chunk.name] = {
-          source: () => newContent,
-          size: () => newContent.length
-        }
-      })
-      callback()
+      const source = new ConcatSource()
+
+      source.add(`
+        __NEXT_REGISTER_PAGE('${routeName}', function() {
+          var comp = 
+      `)
+      source.add(modules)
+      source.add(`
+          return { page: comp.default }
+        })
+      `)
+
+      return source
+    })
+  }
+}
+
+export default class PagesPlugin {
+  apply (compiler) {
+    compiler.plugin('compilation', (compilation) => {
+      compilation.chunkTemplate.apply(new PageChunkTemplatePlugin())
     })
   }
 }
diff --git a/server/build/webpack.js b/server/build/webpack.js
index d080b178..231b6c8e 100644
--- a/server/build/webpack.js
+++ b/server/build/webpack.js
@@ -149,6 +149,7 @@ export default async function createCompiler (dir, { buildId, dev = false, quiet
         output: 'app.js'
       }),
       new webpack.optimize.UglifyJsPlugin({
+        exclude: ['manifest.js', 'commons.js', 'main.js'],
         compress: { warnings: false },
         sourceMap: false
       })
diff --git a/server/index.js b/server/index.js
index 51a4b851..164e6e38 100644
--- a/server/index.js
+++ b/server/index.js
@@ -408,7 +408,11 @@ export default class Server {
   }
 
   handleBuildId (buildId, res) {
-    if (this.dev) return true
+    if (this.dev) {
+      res.setHeader('Cache-Control', 'no-store, must-revalidate')
+      return true
+    }
+
     if (buildId !== this.renderOpts.buildId) {
       return false
     }
@@ -428,13 +432,17 @@ export default class Server {
   }
 
   handleBuildHash (filename, hash, res) {
-    if (this.dev) return
+    if (this.dev) {
+      res.setHeader('Cache-Control', 'no-store, must-revalidate')
+      return true
+    }
 
     if (hash !== this.buildStats[filename].hash) {
       throw new Error(`Invalid Build File Hash(${hash}) for chunk: ${filename}`)
     }
 
     res.setHeader('Cache-Control', 'max-age=365000000, immutable')
+    return true
   }
 
   send404 (res) {
diff --git a/server/render.js b/server/render.js
index bc0ae6fa..699eef4f 100644
--- a/server/render.js
+++ b/server/render.js
@@ -96,11 +96,6 @@ async function doRender (req, res, pathname, query, {
   }
 
   const docProps = await loadGetInitialProps(Document, { ...ctx, renderPage })
-  // While developing, we should not cache any assets.
-  // So, we use a different buildId for each page load.
-  // With that we can ensure, we have unique URL for assets per every page load.
-  // So, it'll prevent issues like this: https://git.io/vHLtb
-  const devBuildId = Date.now()
 
   if (res.finished) return
 
@@ -110,7 +105,7 @@ async function doRender (req, res, pathname, query, {
       props,
       pathname,
       query,
-      buildId: dev ? devBuildId : buildId,
+      buildId,
       buildStats,
       assetPrefix,
       nextExport,