diff --git a/setup.py b/setup.py
index ebee37b28..f682fd13f 100755
--- a/setup.py
+++ b/setup.py
@@ -258,17 +258,15 @@ extras_require = dict(
     nbconvert = ['pygments', 'jinja2', 'mistune>=0.3.1']
 )
 
+if not sys.platform.startswith('win'):
+    extras_require['notebook'].append('terminado>=0.3.3')
+
 if sys.version_info < (3, 3):
     extras_require['test'].append('mock')
 
 extras_require['notebook'].extend(extras_require['nbformat'])
 extras_require['nbconvert'].extend(extras_require['nbformat'])
 
-everything = set()
-for deps in extras_require.values():
-    everything.update(deps)
-extras_require['all'] = everything
-
 install_requires = []
 
 # add readline
@@ -278,6 +276,10 @@ if sys.platform == 'darwin':
 elif sys.platform.startswith('win'):
     extras_require['terminal'].append('pyreadline>=2.0')
 
+everything = set()
+for deps in extras_require.values():
+    everything.update(deps)
+extras_require['all'] = everything
 
 if 'setuptools' in sys.modules:
     # setup.py develop should check for submodules
diff --git a/setupbase.py b/setupbase.py
index 3467fe7e5..4fe466657 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -670,9 +670,11 @@ def get_bdist_wheel():
                     if found:
                         lis.pop(idx)
                 
-                for pkg in ("gnureadline", "pyreadline", "mock"):
+                for pkg in ("gnureadline", "pyreadline", "mock", "terminado"):
                     _remove_startswith(requires, pkg)
                 requires.append("gnureadline; sys.platform == 'darwin' and platform.python_implementation == 'CPython'")
+                requires.append("terminado (>=0.3.3); extra == 'notebook' and sys.platform != 'win32'")
+                requires.append("terminado (>=0.3.3); extra == 'all' and sys.platform != 'win32'")
                 requires.append("pyreadline (>=2.0); extra == 'terminal' and sys.platform == 'win32' and platform.python_implementation == 'CPython'")
                 requires.append("pyreadline (>=2.0); extra == 'all' and sys.platform == 'win32' and platform.python_implementation == 'CPython'")
                 requires.append("mock; extra == 'test' and python_version < '3.3'")