diff --git a/Tools/scripts/serve.py b/Tools/scripts/serve.py
index b8d9cd73387..50061d5ad3b 100755
--- a/Tools/scripts/serve.py
+++ b/Tools/scripts/serve.py
@@ -28,5 +28,8 @@ if __name__ == '__main__':
     path = sys.argv[1]
     port = int(sys.argv[2]) if len(sys.argv) > 2 else 8000
     httpd = simple_server.make_server('', port, app)
-    print "Serving %s on port %s" % (path, port)
-    httpd.serve_forever()
+    print "Serving %s on port %s, control-C to stop" % (path, port)
+    try:
+        httpd.serve_forever()
+    except KeyboardInterrupt:
+        print "\b\bShutting down."