diff --git a/IPython/frontend/html/notebook/handlers.py b/IPython/frontend/html/notebook/handlers.py
index b6ad68b8c..2d722fdb8 100644
--- a/IPython/frontend/html/notebook/handlers.py
+++ b/IPython/frontend/html/notebook/handlers.py
@@ -6,13 +6,10 @@ import urllib
 import uuid
 from Queue import Queue
 
-from tornado import options
 from tornado import web
 from tornado import websocket
 
 
-options.define("port", default=8888, help="run on the given port", type=int)
-
 _kernel_id_regex = r"(?P<kernel_id>\w+-\w+-\w+-\w+-\w+)"
 _kernel_action_regex = r"(?P<action>restart|interrupt)"
 
diff --git a/IPython/frontend/html/notebook/notebookapp.py b/IPython/frontend/html/notebook/notebookapp.py
index ca7a6a268..5d34425d6 100644
--- a/IPython/frontend/html/notebook/notebookapp.py
+++ b/IPython/frontend/html/notebook/notebookapp.py
@@ -115,7 +115,7 @@ class NotebookApplication(web.Application):
         return router
 
 
-def main():
+def launch_new_instance():
     options.parse_command_line()
     application = NotebookApplication()
     http_server = httpserver.HTTPServer(application)
diff --git a/setupbase.py b/setupbase.py
index 4e7be1eeb..ba83d52e8 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -282,7 +282,7 @@ def find_scripts(entry_points=False):
     if entry_points:
         console_scripts = [
             'ipython = IPython.frontend.terminal.ipapp:launch_new_instance',
-            'ipython-notebook = IPython.frontend.html.notebook.notebook:main',
+            'ipython-notebook = IPython.frontend.html.notebook.notebookapp:launch_new_instance',
             'pycolor = IPython.utils.PyColorize:main',
             'ipcontroller = IPython.parallel.apps.ipcontrollerapp:launch_new_instance',
             'ipengine = IPython.parallel.apps.ipengineapp:launch_new_instance',