diff --git a/radicale.py b/radicale.py
index a5349b5..de2e5c7 100755
--- a/radicale.py
+++ b/radicale.py
@@ -159,3 +159,7 @@ finally:
             "Closing server listening to %s port %s" % (
                 server.server_name, server.server_port))
         server.shutdown()
+
+    # remove pidfile
+    if options.pid and options.daemon:
+        os.unlink(options.pid)