diff --git a/zuul-server b/zuul-server
index 0f89cd2672..3e06e06652 100755
--- a/zuul-server
+++ b/zuul-server
@@ -16,7 +16,15 @@
 import argparse
 import ConfigParser
 import daemon
-import daemon.pidlockfile
+
+try:
+    import daemon.pidlockfile as pid_file_module
+    pid_file_module # workaround for pyflakes issue #13
+except:
+    # as of python-daemon 1.6 it doesn't bundle pidlockfile anymore
+    # instead it depends on lockfile-0.9.1 which uses pidfile.
+    import daemon.pidfile as pid_file_module
+
 import logging.config
 import os
 import signal
@@ -120,7 +128,7 @@ if __name__ == '__main__':
         pid_fn = os.path.expanduser(server.config.get('zuul', 'pidfile'))
     else:
         pid_fn = '/var/run/zuul/zuul.pid'
-    pid = daemon.pidlockfile.TimeoutPIDLockFile(pid_fn, 10)
+    pid = pid_file_module.TimeoutPIDLockFile(pid_fn, 10)
 
     if server.args.nodaemon:
         server.setup_logging()