diff --git a/bower.json b/bower.json
index 114b4ab1a..0508be5f6 100644
--- a/bower.json
+++ b/bower.json
@@ -15,7 +15,7 @@
     "MathJax": "components/MathJax#~2.6",
     "moment": "~2.8.4",
     "requirejs": "~2.1",
-    "term.js": "chjj/term.js#~0.0.7",
+    "xterm.js": "sourcelair/xterm.js#0.33",
     "text-encoding": "~0.1",
     "underscore": "components/underscore#~1.5",
     "jquery-typeahead": "~2.0.0"
diff --git a/notebook/static/terminal/js/terminado.js b/notebook/static/terminal/js/terminado.js
index 5192f713f..61dda1a00 100644
--- a/notebook/static/terminal/js/terminado.js
+++ b/notebook/static/terminal/js/terminado.js
@@ -1,4 +1,6 @@
-define ([], function() {
+define ([
+    'termjs',
+], function(Terminal) {
     "use strict";
     function make_terminal(element, size, ws_url) {
         var ws = new WebSocket(ws_url);
diff --git a/notebook/templates/page.html b/notebook/templates/page.html
index 7099e2cee..3ee4ef4fe 100644
--- a/notebook/templates/page.html
+++ b/notebook/templates/page.html
@@ -36,7 +36,7 @@
             'jquery-ui': 'components/jquery-ui/ui/minified/jquery-ui.min',
             moment: 'components/moment/moment',
             codemirror: 'components/codemirror',
-            termjs: 'components/term.js/src/term',
+            termjs: 'components/xterm.js/src/xterm',
             typeahead: 'components/jquery-typeahead/dist/jquery.typeahead'
           },
 	  map: { // for backward compatibility
diff --git a/notebook/templates/terminal.html b/notebook/templates/terminal.html
index 230b78118..fd4f7db81 100644
--- a/notebook/templates/terminal.html
+++ b/notebook/templates/terminal.html
@@ -15,6 +15,7 @@ data-ws-path="{{ws_path}}"
 {{super()}}
 
 <link rel="stylesheet" href="{{ static_url("terminal/css/override.css") }}" type="text/css" />
+<link rel="stylesheet" href="{{static_url("components/xterm.js/src/xterm.css")}}" type="text/css" />
 {% endblock %}
 
 {% block site %}
diff --git a/setupbase.py b/setupbase.py
index 62d4e6324..e72244966 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -142,7 +142,8 @@ def find_package_data():
         pjoin(components, "underscore", "underscore-min.js"),
         pjoin(components, "moment", "moment.js"),
         pjoin(components, "moment", "min", "moment.min.js"),
-        pjoin(components, "term.js", "src", "term.js"),
+        pjoin(components, "xterm.js", "src", "xterm.js"),
+        pjoin(components, "xterm.js", "src", "xterm.css"),
         pjoin(components, "text-encoding", "lib", "encoding.js"),
     ])
 
diff --git a/tools/build-main.js b/tools/build-main.js
index 1ae0a64a1..9f6e8539e 100644
--- a/tools/build-main.js
+++ b/tools/build-main.js
@@ -21,7 +21,7 @@ var rjs_config = {
     "jquery-ui": 'components/jquery-ui/ui/minified/jquery-ui.min',
     moment: 'components/moment/moment',
     codemirror: 'components/codemirror',
-    termjs: 'components/term.js/src/term',
+    termjs: 'components/xterm.js/src/xterm',
     typeahead: 'components/jquery-typeahead/dist/jquery.typeahead',
     contents: 'empty:'
   },