diff --git a/bin/next-dev b/bin/next-dev
index 34b6c758..737bd378 100755
--- a/bin/next-dev
+++ b/bin/next-dev
@@ -3,7 +3,7 @@
 import { resolve } from 'path'
 import parseArgs from 'minimist'
 import Server from '../server'
-import build from '../server/build'
+import build from '../server/build/index'
 
 const argv = parseArgs(process.argv.slice(2), {
   alias: {
diff --git a/client/eval-script.js b/client/eval-script.js
index 2eb392f4..32be60b8 100644
--- a/client/eval-script.js
+++ b/client/eval-script.js
@@ -2,12 +2,14 @@ import React from 'react'
 import ReactDOM from 'react-dom'
 import App from '../lib/app'
 import Link from '../lib/link'
+import Css from '../lib/css'
 
 const modules = new Map([
   ['react', React],
   ['react-dom', ReactDOM],
   ['next/app', App],
-  ['next/link', Link]
+  ['next/link', Link],
+  ['next/css', Css]
 ])
 
 /**
diff --git a/server/build/bundle.js b/server/build/bundle.js
index 9e27c676..0a0d3291 100644
--- a/server/build/bundle.js
+++ b/server/build/bundle.js
@@ -14,7 +14,8 @@ export default function bundle (src, dst) {
       'react-dom',
       {
         [require.resolve('react')]: 'react',
-        [require.resolve('../lib/link')]: 'next/link'
+        [require.resolve('../../lib/link')]: 'next/link',
+        [require.resolve('../../lib/css')]: 'next/css'
       }
     ],
     resolveLoader: {
diff --git a/server/build/transpile.js b/server/build/transpile.js
index 1d361d0c..407acb3a 100644
--- a/server/build/transpile.js
+++ b/server/build/transpile.js
@@ -25,7 +25,8 @@ const babelOptions = {
       [
         { src: `npm:${babelRuntimePath}`, expose: 'babel-runtime' },
         { src: `npm:${require.resolve('react')}`, expose: 'react' },
-        { src: `npm:${require.resolve('../lib/link')}`, expose: 'next/link' }
+        { src: `npm:${require.resolve('../../lib/link')}`, expose: 'next/link' },
+        { src: `npm:${require.resolve('../../lib/css')}`, expose: 'next/css' }
       ]
     ]
   ],