diff --git a/client/next-dev.js b/client/next-dev.js
index 454365e3d276b..f46e885524f2f 100644
--- a/client/next-dev.js
+++ b/client/next-dev.js
@@ -1,6 +1,6 @@
 import 'react-hot-loader/patch'
 import * as next from './next'
-
-module.exports = next
+import { requireModule } from '../lib/eval-script'
 
 window.next = next
+module.exports = requireModule
diff --git a/client/next.js b/client/next.js
index 7b224536d46f8..00333dd1b5236 100644
--- a/client/next.js
+++ b/client/next.js
@@ -4,24 +4,33 @@ import HeadManager from './head-manager'
 import { rehydrate } from '../lib/css'
 import Router from '../lib/router'
 import App from '../lib/app'
-import evalScript from '../lib/eval-script'
+import evalScript, { requireModule } from '../lib/eval-script'
 
 const {
   __NEXT_DATA__: { component, errorComponent, props, ids, err }
 } = window
 
-const Component = evalScript(component).default
-const ErrorComponent = evalScript(errorComponent).default
+document.addEventListener('DOMContentLoaded', () => {
+  const Component = evalScript(component).default
+  const ErrorComponent = evalScript(errorComponent).default
 
-export const router = new Router(window.location.href, {
-  Component,
-  ErrorComponent,
-  ctx: { err }
-})
+  const router = new Router(window.location.href, {
+    Component,
+    ErrorComponent,
+    ctx: { err }
+  })
+
+  // This it to support error handling in the dev time with hot code reload.
+  if (window.next) {
+    window.next.router = router
+  }
 
-const headManager = new HeadManager()
-const container = document.getElementById('__next')
-const appProps = { Component, props, router, headManager }
+  const headManager = new HeadManager()
+  const container = document.getElementById('__next')
+  const appProps = { Component, props, router, headManager }
+
+  rehydrate(ids)
+  render(createElement(App, appProps), container)
+})
 
-rehydrate(ids)
-render(createElement(App, appProps), container)
+module.exports = requireModule
diff --git a/examples/shared-modules/README.md b/examples/shared-modules/README.md
new file mode 100644
index 0000000000000..1e629fd9b8107
--- /dev/null
+++ b/examples/shared-modules/README.md
@@ -0,0 +1,13 @@
+# Example app using shared modules
+
+This example features:
+
+* An app with two pages which has a common Counter component
+* That Counter component maintain the counter inside its module.
+
+## How to run it
+
+```sh
+npm install
+npm run dev
+```
diff --git a/examples/shared-modules/components/Counter.js b/examples/shared-modules/components/Counter.js
new file mode 100644
index 0000000000000..959d8ae96f22d
--- /dev/null
+++ b/examples/shared-modules/components/Counter.js
@@ -0,0 +1,19 @@
+import React from 'react'
+
+let count = 0
+
+export default class Counter extends React.Component {
+  add () {
+    count += 1
+    this.forceUpdate()
+  }
+
+  render () {
+    return (
+      <div>
+        <p>Count is: {count}</p>
+        <button onClick={() => this.add()}>Add</button>
+      </div>
+    )
+  }
+}
diff --git a/examples/shared-modules/components/Header.js b/examples/shared-modules/components/Header.js
new file mode 100644
index 0000000000000..52c6b543cc31b
--- /dev/null
+++ b/examples/shared-modules/components/Header.js
@@ -0,0 +1,20 @@
+import React from 'react'
+import Link from 'next/link'
+
+const styles = {
+  a: {
+    marginRight: 10
+  }
+}
+
+export default () => (
+  <div>
+    <Link href='/'>
+      <a style={styles.a} >Home</a>
+    </Link>
+
+    <Link href='/about'>
+      <a style={styles.a} >About</a>
+    </Link>
+  </div>
+)
diff --git a/examples/shared-modules/package.json b/examples/shared-modules/package.json
new file mode 100644
index 0000000000000..aeb6e6b5e5cc3
--- /dev/null
+++ b/examples/shared-modules/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "shared-modules",
+  "version": "1.0.0",
+  "description": "This example features:",
+  "main": "index.js",
+  "scripts": {
+    "dev": "next",
+    "build": "next build",
+    "start": "next start"
+  },
+  "dependencies": {
+    "next": "*"
+  },
+  "author": "",
+  "license": "ISC",
+  "next": {
+    "cdn": false
+  }
+}
diff --git a/examples/shared-modules/pages/about.js b/examples/shared-modules/pages/about.js
new file mode 100644
index 0000000000000..f7122c7c91e48
--- /dev/null
+++ b/examples/shared-modules/pages/about.js
@@ -0,0 +1,11 @@
+import React from 'react'
+import Header from '../components/Header'
+import Counter from '../components/Counter'
+
+export default () => (
+  <div>
+    <Header />
+    <p>This is the about page.</p>
+    <Counter />
+  </div>
+)
diff --git a/examples/shared-modules/pages/index.js b/examples/shared-modules/pages/index.js
new file mode 100644
index 0000000000000..d3dcba1de59b6
--- /dev/null
+++ b/examples/shared-modules/pages/index.js
@@ -0,0 +1,11 @@
+import React from 'react'
+import Header from '../components/Header'
+import Counter from '../components/Counter'
+
+export default () => (
+  <div>
+    <Header />
+    <p>HOME PAGE is here!</p>
+    <Counter />
+  </div>
+)
diff --git a/gulpfile.js b/gulpfile.js
index 45a9f5b34c03e..1332c82881c38 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -100,7 +100,7 @@ gulp.task('build-dev-client', ['compile-lib', 'compile-client'], () => {
   .src('dist/client/next-dev.js')
   .pipe(webpack({
     quiet: true,
-    output: { filename: 'next-dev.bundle.js' },
+    output: { filename: 'next-dev.bundle.js', libraryTarget: 'var', library: 'require' },
     module: {
       loaders: [
         {
@@ -125,7 +125,7 @@ gulp.task('build-client', ['compile-lib', 'compile-client'], () => {
   .src('dist/client/next.js')
   .pipe(webpack({
     quiet: true,
-    output: { filename: 'next.bundle.js' },
+    output: { filename: 'next.bundle.js', libraryTarget: 'var', library: 'require' },
     plugins: [
       new webpack.webpack.DefinePlugin({
         'process.env': {
diff --git a/lib/document.js b/lib/document.js
index 9cef4a64d8b56..8dd5ec53e2d95 100644
--- a/lib/document.js
+++ b/lib/document.js
@@ -10,8 +10,11 @@ export default ({ head, css, html, data, dev, staticMarkup, cdn }) => {
     </head>
     <body>
       <div id='__next' dangerouslySetInnerHTML={{ __html: html }} />
-      {staticMarkup ? null : <script dangerouslySetInnerHTML={{ __html: '__NEXT_DATA__ = ' + htmlescape(data) }} />}
+      {staticMarkup ? null : <script dangerouslySetInnerHTML={{
+        __html: `__NEXT_DATA__ =${htmlescape(data)}; module={};`
+      }} />}
       {staticMarkup ? null : createClientScript({ dev, cdn })}
+      <script type='text/javascript' src='/_next/commons.js' />
     </body>
   </html>
 }
@@ -30,7 +33,6 @@ function createClientScript ({ dev, cdn }) {
       load('https://cdn.zeit.co/next.js/${pkg.version}/next.min.js', function (err) {
         if (err) load('/_next/next.bundle.js')
       })
-
       function load (src, fn) {
         fn = fn || function () {}
         var script = document.createElement('script')
diff --git a/lib/eval-script.js b/lib/eval-script.js
index 58b775f4af0c0..335384a6352b1 100644
--- a/lib/eval-script.js
+++ b/lib/eval-script.js
@@ -14,6 +14,17 @@ const modules = new Map([
   ['next/head', Head]
 ])
 
+function require (moduleName) {
+  const name = moduleName
+  const m = modules.get(name)
+
+  if (m) return m
+
+  throw new Error(`Module "${moduleName}" is not exists in the bundle`)
+}
+
+export const requireModule = require
+
 /**
  * IMPORTANT: This module is compiled *without* `use strict`
  * so that when we `eval` a dependency below, we don't enforce
@@ -28,10 +39,6 @@ const modules = new Map([
 
 export default function evalScript (script) {
   const module = { exports: {} }
-  const require = function (path) { // eslint-disable-line no-unused-vars
-    return modules.get(path)
-  }
-  // don't use Function() here since it changes source locations
   eval(script) // eslint-disable-line no-eval
   return module.exports
 }
diff --git a/server/build/webpack.js b/server/build/webpack.js
index 0811102d3ecb8..df8049c70443c 100644
--- a/server/build/webpack.js
+++ b/server/build/webpack.js
@@ -39,6 +39,10 @@ export default async function createCompiler (dir, { hotReload = false, dev = fa
       log: false,
       // required not to cache removed files
       useHashIndex: false
+    }),
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'commons',
+      filename: 'commons.js'
     })
   ]
 
diff --git a/server/index.js b/server/index.js
index 7ebbaa74ba37d..ff3ae803cefd5 100644
--- a/server/index.js
+++ b/server/index.js
@@ -40,6 +40,11 @@ export default class Server {
   }
 
   defineRoutes () {
+    this.router.get('/_next/commons.js', async (req, res, params) => {
+      const p = join(this.dir, '.next/commons.js')
+      await this.serveStatic(req, res, p)
+    })
+
     this.router.get('/_next/:path+', async (req, res, params) => {
       const p = join(__dirname, '..', 'client', ...(params.path || []))
       await this.serveStatic(req, res, p)