diff --git a/notebook/notebookapp.py b/notebook/notebookapp.py
index 28f6496ec4..82ccb146b2 100755
--- a/notebook/notebookapp.py
+++ b/notebook/notebookapp.py
@@ -346,6 +346,33 @@ def start(self):
         self.log.info("Wrote hashed password to %s" % self.config_file)
 
 
+class NbserverStopApp(JupyterApp):
+    version = __version__
+    description="Stop currently running notebook server for a given port"
+
+    port = Integer(8888, config=True,
+        help="Port of the server to be killed. Default 8888")
+
+    def parse_command_line(self, argv=None):
+        super(NbserverStopApp, self).parse_command_line(argv)
+        if self.extra_args:
+            self.port=int(self.extra_args[0])
+
+    def start(self):
+        servers=list_running_servers(self.runtime_dir)
+        server=next((server for server in servers if server.get('port')==self.port),None)
+        if server: os.kill(server.get('pid'), signal.SIGTERM)
+        else:
+            ports=[s.get('port') for s in list_running_servers(self.runtime_dir)]
+            if ports:
+                print("There is currently no server running on port {}.".format(self.port))
+                print("Ports currently in use:")
+                for port in ports: print("\t* {}".format(port))
+            else:
+                print("There are currently no running servers")
+            self.exit(1)
+
+
 class NbserverListApp(JupyterApp):
     version = __version__
     description="List currently running notebook servers."
@@ -449,6 +476,7 @@ class NotebookApp(JupyterApp):
     
     subcommands = dict(
         list=(NbserverListApp, NbserverListApp.description.splitlines()[0]),
+        stop=(NbserverStopApp, NbserverStopApp.description.splitlines()[0]),
         password=(NotebookPasswordApp, NotebookPasswordApp.description.splitlines()[0]),
     )