diff --git a/IPython/utils/notification.py b/IPython/utils/notification.py
index e0718d2b594..ef15111b039 100644
--- a/IPython/utils/notification.py
+++ b/IPython/utils/notification.py
@@ -35,7 +35,7 @@ class NotificationCenter(object):
     --------
     Here is a simple example of how to use this::
 
-        import IPython.kernel.core.notification as notification
+        import IPython.util.notification as notification
         def callback(ntype, theSender, args={}):
             print ntype,theSender,args
 
diff --git a/docs/source/index.txt b/docs/source/index.txt
index 51da5c6b54a..243bdec4e9d 100644
--- a/docs/source/index.txt
+++ b/docs/source/index.txt
@@ -19,6 +19,7 @@ Contents
    whatsnew/index.txt
    install/index.txt
    interactive/index.txt
+   parallel/index.txt
    config/index.txt
    development/index.txt
    api/index.txt
diff --git a/docs/source/parallel/index.txt b/docs/source/parallel/index.txt
new file mode 100644
index 00000000000..d1a1e40841d
--- /dev/null
+++ b/docs/source/parallel/index.txt
@@ -0,0 +1,12 @@
+.. _parallel_index:
+
+====================================
+Using IPython for parallel computing
+====================================
+
+The twisted-based :mod:`IPython.kernel` has been removed, in favor of
+the new 0MQ-based :mod:`IPython.parallel`, whose merge into master is imminent.
+
+Until that code is merged, it can be found in the `newparallel branch 
+<https://github.com/ipython/ipython/tree/newparallel>`_, and its draft documentation can be
+found `here <http://minrk.github.com/ipython-doc/newparallel>`_.
\ No newline at end of file
diff --git a/setup.py b/setup.py
index db264c9499f..f6c7e99fc72 100755
--- a/setup.py
+++ b/setup.py
@@ -215,9 +215,9 @@ def cleanup():
             'ipython = IPython.frontend.terminal.ipapp:launch_new_instance',
             'ipython-qtconsole = IPython.frontend.qt.console.ipythonqt:main',
             'pycolor = IPython.utils.PyColorize:main',
-            'ipcontroller = IPython.kernel.ipcontrollerapp:launch_new_instance',
-            'ipengine = IPython.kernel.ipengineapp:launch_new_instance',
-            'ipcluster = IPython.kernel.ipclusterapp:launch_new_instance',
+            # 'ipcontroller = IPython.kernel.ipcontrollerapp:launch_new_instance',
+            # 'ipengine = IPython.kernel.ipengineapp:launch_new_instance',
+            # 'ipcluster = IPython.kernel.ipclusterapp:launch_new_instance',
             'iptest = IPython.testing.iptest:main',
             'irunner = IPython.lib.irunner:main'
         ]
diff --git a/setupbase.py b/setupbase.py
index 4c3812e9233..51be1cdb633 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -120,6 +120,7 @@ def find_packages():
     add_package(packages, 'external.pyparsing')
     add_package(packages, 'external.simplegeneric')
     add_package(packages, 'external.validate')
+    add_package(packages, 'kernel')
     add_package(packages, 'frontend')
     add_package(packages, 'frontend.qt')
     add_package(packages, 'frontend.qt.console', tests=True)
@@ -259,11 +260,11 @@ def find_scripts():
     """
     Find IPython's scripts.
     """
-    kernel_scripts = pjoin('IPython','kernel','scripts')
+    # kernel_scripts = pjoin('IPython','kernel','scripts')
     main_scripts = pjoin('IPython','scripts')
-    scripts = [pjoin(kernel_scripts, 'ipengine'),
-               pjoin(kernel_scripts, 'ipcontroller'),
-               pjoin(kernel_scripts, 'ipcluster'),
+    scripts = [# pjoin(kernel_scripts, 'ipengine'),
+               # pjoin(kernel_scripts, 'ipcontroller'),
+               # pjoin(kernel_scripts, 'ipcluster'),
                pjoin(main_scripts, 'ipython'),
                pjoin(main_scripts, 'ipython-qtconsole'),
                pjoin(main_scripts, 'pycolor'),
@@ -296,8 +297,6 @@ def check_for_dependencies():
     """
     from setupext.setupext import (
         print_line, print_raw, print_status,
-        check_for_zopeinterface, check_for_twisted,
-        check_for_foolscap, check_for_pyopenssl,
         check_for_sphinx, check_for_pygments,
         check_for_nose, check_for_pexpect
     )
@@ -311,10 +310,6 @@ def check_for_dependencies():
     print_raw("")
     print_raw("OPTIONAL DEPENDENCIES")
 
-    check_for_zopeinterface()
-    check_for_twisted()
-    check_for_foolscap()
-    check_for_pyopenssl()
     check_for_sphinx()
     check_for_pygments()
     check_for_nose()