diff --git a/pelican/server.py b/pelican/server.py
index 602d3b21..fd99b209 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -22,4 +22,8 @@ except OSError as e:
 
 
 print("serving at port", PORT)
-httpd.serve_forever()
+try:
+    httpd.serve_forever()
+except KeyboardInterrupt as e:
+    print("shutting down server")
+    httpd.socket.close()
\ No newline at end of file