diff --git a/setupbase.py b/setupbase.py
index 1b98795e4..666eceab2 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -110,8 +110,8 @@ def find_packages():
     add_package(packages, 'external')
     add_package(packages, 'frontend')
     add_package(packages, 'frontend.qt')
-    add_package(packages, 'frontend.qt.console', tests=True, scripts=True)
-    add_package(packages, 'frontend.terminal', tests=True, scripts=True)    
+    add_package(packages, 'frontend.qt.console', tests=True)
+    add_package(packages, 'frontend.terminal', tests=True)    
     add_package(packages, 'kernel', config=False, tests=True, scripts=True)
     add_package(packages, 'kernel.core', config=False, tests=True)
     add_package(packages, 'lib', tests=True)
@@ -256,13 +256,11 @@ def find_scripts():
     """
     kernel_scripts = pjoin('IPython','kernel','scripts')
     main_scripts = pjoin('IPython','scripts')
-    frontend_terminal_scripts = pjoin('IPython','frontend','terminal','scripts')
-    frontend_qt_scripts = pjoin('IPython','frontend','qt','console','scripts')
     scripts = [pjoin(kernel_scripts, 'ipengine'),
                pjoin(kernel_scripts, 'ipcontroller'),
                pjoin(kernel_scripts, 'ipcluster'),
-               pjoin(frontend_terminal_scripts, 'ipython'),
-               pjoin(frontend_qt_scripts, 'ipythonqt'),
+               pjoin(main_scripts, 'ipython'),
+               pjoin(main_scripts, 'ipython-qtconsole'),
                pjoin(main_scripts, 'pycolor'),
                pjoin(main_scripts, 'irunner'),
                pjoin(main_scripts, 'iptest')