diff --git a/IPython/parallel.py b/IPython/parallel.py
new file mode 100644
index 0000000..70dca71
--- /dev/null
+++ b/IPython/parallel.py
@@ -0,0 +1,20 @@
+"""
+Shim to maintain backwards compatibility with old IPython.parallel imports.
+"""
+# Copyright (c) IPython Development Team.
+# Distributed under the terms of the Modified BSD License.
+
+from __future__ import print_function
+
+import sys
+from warnings import warn
+
+warn("The `IPython.parallel` package has been deprecated. "
+     "You should import from ipython_parallel instead.")
+
+from IPython.utils.shimmodule import ShimModule
+
+# Unconditionally insert the shim into sys.modules so that further import calls
+# trigger the custom attribute access above
+
+sys.modules['IPython.parallel'] = ShimModule('parallel', mirror='ipython_parallel')
diff --git a/IPython/parallel/__init__.py b/ipython_parallel/__init__.py
similarity index 100%
rename from IPython/parallel/__init__.py
rename to ipython_parallel/__init__.py
diff --git a/IPython/parallel/apps/__init__.py b/ipython_parallel/apps/__init__.py
similarity index 100%
rename from IPython/parallel/apps/__init__.py
rename to ipython_parallel/apps/__init__.py
diff --git a/IPython/parallel/apps/baseapp.py b/ipython_parallel/apps/baseapp.py
similarity index 100%
rename from IPython/parallel/apps/baseapp.py
rename to ipython_parallel/apps/baseapp.py
diff --git a/IPython/parallel/apps/ipclusterapp.py b/ipython_parallel/apps/ipclusterapp.py
similarity index 100%
rename from IPython/parallel/apps/ipclusterapp.py
rename to ipython_parallel/apps/ipclusterapp.py
diff --git a/IPython/parallel/apps/ipcontrollerapp.py b/ipython_parallel/apps/ipcontrollerapp.py
similarity index 100%
rename from IPython/parallel/apps/ipcontrollerapp.py
rename to ipython_parallel/apps/ipcontrollerapp.py
diff --git a/IPython/parallel/apps/ipengineapp.py b/ipython_parallel/apps/ipengineapp.py
similarity index 100%
rename from IPython/parallel/apps/ipengineapp.py
rename to ipython_parallel/apps/ipengineapp.py
diff --git a/IPython/parallel/apps/iploggerapp.py b/ipython_parallel/apps/iploggerapp.py
similarity index 100%
rename from IPython/parallel/apps/iploggerapp.py
rename to ipython_parallel/apps/iploggerapp.py
diff --git a/IPython/parallel/apps/launcher.py b/ipython_parallel/apps/launcher.py
similarity index 100%
rename from IPython/parallel/apps/launcher.py
rename to ipython_parallel/apps/launcher.py
diff --git a/IPython/parallel/apps/logwatcher.py b/ipython_parallel/apps/logwatcher.py
similarity index 100%
rename from IPython/parallel/apps/logwatcher.py
rename to ipython_parallel/apps/logwatcher.py
diff --git a/IPython/parallel/apps/win32support.py b/ipython_parallel/apps/win32support.py
similarity index 100%
rename from IPython/parallel/apps/win32support.py
rename to ipython_parallel/apps/win32support.py
diff --git a/IPython/parallel/apps/winhpcjob.py b/ipython_parallel/apps/winhpcjob.py
similarity index 100%
rename from IPython/parallel/apps/winhpcjob.py
rename to ipython_parallel/apps/winhpcjob.py
diff --git a/IPython/parallel/client/__init__.py b/ipython_parallel/client/__init__.py
similarity index 100%
rename from IPython/parallel/client/__init__.py
rename to ipython_parallel/client/__init__.py
diff --git a/IPython/parallel/client/asyncresult.py b/ipython_parallel/client/asyncresult.py
similarity index 100%
rename from IPython/parallel/client/asyncresult.py
rename to ipython_parallel/client/asyncresult.py
diff --git a/IPython/parallel/client/client.py b/ipython_parallel/client/client.py
similarity index 100%
rename from IPython/parallel/client/client.py
rename to ipython_parallel/client/client.py
diff --git a/IPython/parallel/client/magics.py b/ipython_parallel/client/magics.py
similarity index 100%
rename from IPython/parallel/client/magics.py
rename to ipython_parallel/client/magics.py
diff --git a/IPython/parallel/client/map.py b/ipython_parallel/client/map.py
similarity index 100%
rename from IPython/parallel/client/map.py
rename to ipython_parallel/client/map.py
diff --git a/IPython/parallel/client/remotefunction.py b/ipython_parallel/client/remotefunction.py
similarity index 100%
rename from IPython/parallel/client/remotefunction.py
rename to ipython_parallel/client/remotefunction.py
diff --git a/IPython/parallel/client/view.py b/ipython_parallel/client/view.py
similarity index 100%
rename from IPython/parallel/client/view.py
rename to ipython_parallel/client/view.py
diff --git a/IPython/parallel/cluster.py b/ipython_parallel/cluster.py
similarity index 100%
rename from IPython/parallel/cluster.py
rename to ipython_parallel/cluster.py
diff --git a/IPython/parallel/controller/__init__.py b/ipython_parallel/controller/__init__.py
similarity index 100%
rename from IPython/parallel/controller/__init__.py
rename to ipython_parallel/controller/__init__.py
diff --git a/IPython/parallel/controller/__main__.py b/ipython_parallel/controller/__main__.py
similarity index 100%
rename from IPython/parallel/controller/__main__.py
rename to ipython_parallel/controller/__main__.py
diff --git a/IPython/parallel/controller/dependency.py b/ipython_parallel/controller/dependency.py
similarity index 100%
rename from IPython/parallel/controller/dependency.py
rename to ipython_parallel/controller/dependency.py
diff --git a/IPython/parallel/controller/dictdb.py b/ipython_parallel/controller/dictdb.py
similarity index 100%
rename from IPython/parallel/controller/dictdb.py
rename to ipython_parallel/controller/dictdb.py
diff --git a/IPython/parallel/controller/heartmonitor.py b/ipython_parallel/controller/heartmonitor.py
similarity index 100%
rename from IPython/parallel/controller/heartmonitor.py
rename to ipython_parallel/controller/heartmonitor.py
diff --git a/IPython/parallel/controller/hub.py b/ipython_parallel/controller/hub.py
similarity index 100%
rename from IPython/parallel/controller/hub.py
rename to ipython_parallel/controller/hub.py
diff --git a/IPython/parallel/controller/mongodb.py b/ipython_parallel/controller/mongodb.py
similarity index 100%
rename from IPython/parallel/controller/mongodb.py
rename to ipython_parallel/controller/mongodb.py
diff --git a/IPython/parallel/controller/scheduler.py b/ipython_parallel/controller/scheduler.py
similarity index 100%
rename from IPython/parallel/controller/scheduler.py
rename to ipython_parallel/controller/scheduler.py
diff --git a/IPython/parallel/controller/sqlitedb.py b/ipython_parallel/controller/sqlitedb.py
similarity index 100%
rename from IPython/parallel/controller/sqlitedb.py
rename to ipython_parallel/controller/sqlitedb.py
diff --git a/IPython/parallel/engine/__init__.py b/ipython_parallel/engine/__init__.py
similarity index 100%
rename from IPython/parallel/engine/__init__.py
rename to ipython_parallel/engine/__init__.py
diff --git a/IPython/parallel/engine/__main__.py b/ipython_parallel/engine/__main__.py
similarity index 100%
rename from IPython/parallel/engine/__main__.py
rename to ipython_parallel/engine/__main__.py
diff --git a/IPython/parallel/engine/engine.py b/ipython_parallel/engine/engine.py
similarity index 100%
rename from IPython/parallel/engine/engine.py
rename to ipython_parallel/engine/engine.py
diff --git a/IPython/parallel/error.py b/ipython_parallel/error.py
similarity index 100%
rename from IPython/parallel/error.py
rename to ipython_parallel/error.py
diff --git a/IPython/parallel/factory.py b/ipython_parallel/factory.py
similarity index 100%
rename from IPython/parallel/factory.py
rename to ipython_parallel/factory.py
diff --git a/IPython/parallel/logger.py b/ipython_parallel/logger.py
similarity index 100%
rename from IPython/parallel/logger.py
rename to ipython_parallel/logger.py
diff --git a/IPython/parallel/tests/__init__.py b/ipython_parallel/tests/__init__.py
similarity index 100%
rename from IPython/parallel/tests/__init__.py
rename to ipython_parallel/tests/__init__.py
diff --git a/IPython/parallel/tests/clienttest.py b/ipython_parallel/tests/clienttest.py
similarity index 100%
rename from IPython/parallel/tests/clienttest.py
rename to ipython_parallel/tests/clienttest.py
diff --git a/IPython/parallel/tests/test_asyncresult.py b/ipython_parallel/tests/test_asyncresult.py
similarity index 100%
rename from IPython/parallel/tests/test_asyncresult.py
rename to ipython_parallel/tests/test_asyncresult.py
diff --git a/IPython/parallel/tests/test_client.py b/ipython_parallel/tests/test_client.py
similarity index 100%
rename from IPython/parallel/tests/test_client.py
rename to ipython_parallel/tests/test_client.py
diff --git a/IPython/parallel/tests/test_db.py b/ipython_parallel/tests/test_db.py
similarity index 100%
rename from IPython/parallel/tests/test_db.py
rename to ipython_parallel/tests/test_db.py
diff --git a/IPython/parallel/tests/test_dependency.py b/ipython_parallel/tests/test_dependency.py
similarity index 100%
rename from IPython/parallel/tests/test_dependency.py
rename to ipython_parallel/tests/test_dependency.py
diff --git a/IPython/parallel/tests/test_launcher.py b/ipython_parallel/tests/test_launcher.py
similarity index 100%
rename from IPython/parallel/tests/test_launcher.py
rename to ipython_parallel/tests/test_launcher.py
diff --git a/IPython/parallel/tests/test_lbview.py b/ipython_parallel/tests/test_lbview.py
similarity index 100%
rename from IPython/parallel/tests/test_lbview.py
rename to ipython_parallel/tests/test_lbview.py
diff --git a/IPython/parallel/tests/test_magics.py b/ipython_parallel/tests/test_magics.py
similarity index 100%
rename from IPython/parallel/tests/test_magics.py
rename to ipython_parallel/tests/test_magics.py
diff --git a/IPython/parallel/tests/test_mongodb.py b/ipython_parallel/tests/test_mongodb.py
similarity index 100%
rename from IPython/parallel/tests/test_mongodb.py
rename to ipython_parallel/tests/test_mongodb.py
diff --git a/IPython/parallel/tests/test_view.py b/ipython_parallel/tests/test_view.py
similarity index 100%
rename from IPython/parallel/tests/test_view.py
rename to ipython_parallel/tests/test_view.py
diff --git a/IPython/parallel/util.py b/ipython_parallel/util.py
similarity index 100%
rename from IPython/parallel/util.py
rename to ipython_parallel/util.py