diff --git a/notebook/templates/page.html b/notebook/templates/page.html
index edc48ab1d..ab47da2ea 100644
--- a/notebook/templates/page.html
+++ b/notebook/templates/page.html
@@ -42,7 +42,7 @@
             'jquery-ui': 'components/jquery-ui/ui/minified/jquery-ui.min',
             moment: 'components/moment/min/moment-with-locales',
             codemirror: 'components/codemirror',
-            termjs: 'components/xterm.js/dist/xterm',
+            termjs: 'components/xterm.js/xterm',
             typeahead: 'components/jquery-typeahead/dist/jquery.typeahead.min',
           },
           map: { // for backward compatibility
diff --git a/notebook/templates/terminal.html b/notebook/templates/terminal.html
index 12b4d1763..59df74a0a 100644
--- a/notebook/templates/terminal.html
+++ b/notebook/templates/terminal.html
@@ -15,7 +15,7 @@ data-ws-path="{{ws_path}}"
 {% block stylesheet %}
 {{super()}}
 <link rel="stylesheet" href="{{ static_url("terminal/css/override.css") }}" type="text/css" />
-<link rel="stylesheet" href="{{static_url("components/xterm.js/dist/xterm.css") }}" type="text/css" />
+<link rel="stylesheet" href="{{static_url("components/xterm.js-css/xterm.css") }}" type="text/css" />
 {% endblock %}
 
 {% block headercontainer %}
diff --git a/setupbase.py b/setupbase.py
index 6a30d7d18..ab630b62a 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -157,8 +157,8 @@ def find_package_data():
         pjoin(components, "underscore", "underscore-min.js"),
         pjoin(components, "moment", "moment.js"),
         pjoin(components, "moment", "min", "*.js"),
-        pjoin(components, "xterm.js", "dist", "xterm.js"),
-        pjoin(components, "xterm.js", "dist", "xterm.css"),
+        pjoin(components, "xterm.js", "xterm.js"),
+        pjoin(components, "xterm.js-css", "xterm.css"),
         pjoin(components, "text-encoding", "lib", "encoding.js"),
     ])
 
diff --git a/tools/build-main.js b/tools/build-main.js
index 44b12a350..5a90b3f12 100644
--- a/tools/build-main.js
+++ b/tools/build-main.js
@@ -24,7 +24,7 @@ var rjs_config = {
     "jquery-ui": 'components/jquery-ui/ui/minified/jquery-ui.min',
     moment: 'components/moment/min/moment-with-locales',
     codemirror: 'components/codemirror',
-    xterm: 'components/xterm.js/dist/xterm',
+    xterm: 'components/xterm.js/xterm',
     typeahead: 'components/jquery-typeahead/dist/jquery.typeahead',
     contents: 'empty:',
     custom: 'empty:',