diff --git a/IPython/scripts/ipython b/IPython/scripts/ipython
index 2aed24c..614a678 100755
--- a/IPython/scripts/ipython
+++ b/IPython/scripts/ipython
@@ -2,6 +2,5 @@
 """Terminal-based IPython entry point.
 """
 
-from IPython.terminal.ipapp import launch_new_instance
-
-launch_new_instance()
+from IPython import start_ipython
+start_ipython()
diff --git a/setupbase.py b/setupbase.py
index 84f7c06..ceca03c 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -315,7 +315,7 @@ def find_scripts(entry_points=False, suffix=''):
     """
     if entry_points:
         console_scripts = [s % suffix for s in [
-            'ipython%s = IPython.terminal.ipapp:launch_new_instance',
+            'ipython%s = IPython:start_ipython',
             'pycolor%s = IPython.utils.PyColorize:main',
             'ipcontroller%s = IPython.parallel.apps.ipcontrollerapp:launch_new_instance',
             'ipengine%s = IPython.parallel.apps.ipengineapp:launch_new_instance',