diff --git a/setup.cfg b/setup.cfg
index b3a26586cf3..5c7554a28fd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -106,9 +106,6 @@ IPython.lib.tests = *.wav
 IPython.testing.plugin = *.txt
 
 [options.entry_points]
-console_scripts =
-    ipython = IPython:start_ipython
-    ipython3 = IPython:start_ipython
 pygments.lexers =
     ipythonconsole = IPython.lib.lexers:IPythonConsoleLexer
     ipython = IPython.lib.lexers:IPythonLexer
diff --git a/setup.py b/setup.py
index bfdf5fb88bf..4939ca53836 100644
--- a/setup.py
+++ b/setup.py
@@ -66,7 +66,7 @@
 # Our own imports
 sys.path.insert(0, ".")
 
-from setupbase import target_update
+from setupbase import target_update, find_entry_points
 
 from setupbase import (
     setup_args,
@@ -139,6 +139,7 @@
     'install_scripts_sym': install_scripts_for_symlink,
     'unsymlink': unsymlink,
 }
+setup_args["entry_points"] = {"console_scripts": find_entry_points()}
 
 #---------------------------------------------------------------------------
 # Do the actual setup now