diff --git a/notebook/build.js b/notebook/build.js
new file mode 100644
index 000000000..63e79182a
--- /dev/null
+++ b/notebook/build.js
@@ -0,0 +1,31 @@
+var fs = require('fs');
+var aliasify = require('aliasify');
+var browserify = require('browserify');
+
+var aliasifyConfig = {
+    aliases: {
+        underscore : 'components/underscore/underscore-min',
+        backbone : 'components/backbone/backbone-min',
+        jquery: 'components/jquery/jquery.min',
+        bootstrap: 'components/bootstrap/js/bootstrap.min',
+        bootstraptour: 'components/bootstrap-tour/build/js/bootstrap-tour.min',
+        jqueryui: 'components/jquery-ui/ui/minified/jquery-ui.min',
+        moment: 'components/moment/moment',
+        codemirror: 'components/codemirror',
+        termjs: 'components/term.js/src/term'
+    },
+    verbose: false
+}
+
+var b = browserify({
+    paths: [
+        __dirname + '/static',
+    ],
+    debug: true,
+    fullPaths: true
+});
+
+b.transform(aliasify, aliasifyConfig);
+b.exclude('contents');
+b.add(__dirname + '/static/' + process.argv[2]);
+b.bundle().pipe(fs.createWriteStream(__dirname + '/static/' + process.argv[3]));
diff --git a/notebook/static/auth/js/main.js b/notebook/static/auth/js/main.js
index 2bb07023f..d2fb30bcf 100644
--- a/notebook/static/auth/js/main.js
+++ b/notebook/static/auth/js/main.js
@@ -1,5 +1,5 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-    exports.login_main = require('./login_main');
-    exports.logout_main = require('./logout_main');
+exports.login_main = require('./loginmain');
+exports.logout_main = require('./logoutmain');
diff --git a/notebook/static/notebook/js/maintoolbar.js b/notebook/static/notebook/js/maintoolbar.js
index 0039e21b3..48f9fa15f 100644
--- a/notebook/static/notebook/js/maintoolbar.js
+++ b/notebook/static/notebook/js/maintoolbar.js
@@ -2,7 +2,6 @@
 // Distributed under the terms of the Modified BSD License.
     "use strict";
 
-    var require = require('require');
     var $ = require('jquery');
     var toolbar = require('./toolbar');
     var celltoolbar = require('./celltoolbar');
diff --git a/package.json b/package.json
index aaf22272a..c2e2313e8 100644
--- a/package.json
+++ b/package.json
@@ -11,19 +11,18 @@
   "scripts": {
     "bower": "bower install --allow-root --config.interactive=false",
     "build": "npm run build:css && npm run build:js",
-    
     "build:css": "concurrent \"npm run build:css:ipython\" \"npm run build:css:style\"",
     "build:css:ipython": "lessc --source-map --include-path=./notebook/static/ ./notebook/static/style/ipython.less ./notebook/static/style/ipython.min.css",
     "build:css:style": "lessc --source-map --include-path=./notebook/static/ ./notebook/static/style/style.less ./notebook/static/style/style.min.css",
-    
     "build:js": "concurrent \"npm run build:js:tree\" \"npm run build:js:terminal\" \"npm run build:js:notebook\" \"npm run build:js:edit\" \"npm run build:js:auth\"",
-    "build:js:notebook": "browserify notebook/static/notebook/js/main.js -o notebook/static/notebook/js/main.bundle.js",
-    "build:js:edit": "browserify notebook/static/edit/js/main.js -o notebook/static/edit/js/main.bundle.js",
-    "build:js:tree": "browserify notebook/static/tree/js/main.js -o notebook/static/tree/js/main.bundle.js",
-    "build:js:auth": "browserify notebook/static/auth/js/main.js -o notebook/static/auth/js/main.bundle.js",
-    "build:js:terminal": "browserify notebook/static/terminal/js/main.js -o notebook/static/terminal/js/main.bundle.js"
+    "build:js:notebook": "node ./notebook/build.js notebook/js/main.js notebook/js/main.bundle.js",
+    "build:js:edit": "node ./notebook/build.js edit/js/main.js edit/js/main.bundle.js",
+    "build:js:tree": "node ./notebook/build.js tree/js/main.js tree/js/main.bundle.js",
+    "build:js:auth": "node ./notebook/build.js auth/js/main.js auth/js/main.bundle.js",
+    "build:js:terminal": "node ./notebook/build.js terminal/js/main.js terminal/js/main.bundle.js"
   },
   "devDependencies": {
+    "aliasify": "^1.7.2",
     "bower": "*",
     "browserify": "^11.0.1",
     "concurrently": "^0.1.1",