diff --git a/setup.py b/setup.py
index 25ab94d14..a4a2748b8 100755
--- a/setup.py
+++ b/setup.py
@@ -210,9 +210,7 @@ setuptools_extra_args = {}
 
 if 'setuptools' in sys.modules:
     setuptools_extra_args['zip_safe'] = False
-    setuptools_extra_args['entry_points'] = {
-        'console_scripts': find_scripts(True)
-    }
+    setuptools_extra_args['entry_points'] = find_scripts(True)
     setup_args['extras_require'] = dict(
         parallel = 'pyzmq>=2.1.4',
         zmq = 'pyzmq>=2.0.10.1',
diff --git a/setupbase.py b/setupbase.py
index 4cd353fd3..c8a8f40ba 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -267,12 +267,10 @@ def find_scripts(entry_points=False):
         return setuptools entry_point-style definitions
     else:
         return file paths of plain scripts [default]
-    
     """
     if entry_points:
-        scripts = [
+        console_scripts = [
             'ipython = IPython.frontend.terminal.ipapp:launch_new_instance',
-            'ipython-qtconsole = IPython.frontend.qt.console.ipythonqt:main',
             'pycolor = IPython.utils.PyColorize:main',
             'ipcontroller = IPython.parallel.apps.ipcontrollerapp:launch_new_instance',
             'ipengine = IPython.parallel.apps.ipengineapp:launch_new_instance',
@@ -281,6 +279,10 @@ def find_scripts(entry_points=False):
             'iptest = IPython.testing.iptest:main',
             'irunner = IPython.lib.irunner:main'
         ]
+        gui_scripts = [
+            'ipython-qtconsole = IPython.frontend.qt.console.ipythonqt:main',
+        ]
+        scripts = dict(console_scripts=console_scripts, gui_scripts=gui_scripts)
     else:
         parallel_scripts = pjoin('IPython','parallel','scripts')
         main_scripts = pjoin('IPython','scripts')
@@ -294,8 +296,7 @@ def find_scripts(entry_points=False):
                    pjoin(main_scripts, 'pycolor'),
                    pjoin(main_scripts, 'irunner'),
                    pjoin(main_scripts, 'iptest')
-                  ]
-    
+        ]
     return scripts
 
 #---------------------------------------------------------------------------