diff --git a/pelican/server.py b/pelican/server.py
index fd99b209..24f3ae04 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -10,7 +10,7 @@ try:
 except ImportError:
     import socketserver  # NOQA
 
-PORT = 8000
+PORT = len(sys.argv) == 2 and int(sys.argv[1]) or 8000
 
 Handler = srvmod.SimpleHTTPRequestHandler
 
@@ -26,4 +26,4 @@ try:
     httpd.serve_forever()
 except KeyboardInterrupt as e:
     print("shutting down server")
-    httpd.socket.close()
\ No newline at end of file
+    httpd.socket.close()