diff --git a/lib/locking.py b/lib/locking.py
index f30e8b703d994debd1f3983484e38ba19938f009..3f30c06b9595ad4a49032ce54e2b9d04250323ba 100644
--- a/lib/locking.py
+++ b/lib/locking.py
@@ -145,7 +145,8 @@ class _SingleNotifyPipeConditionWaiter(object):
         break
 
       try:
-        result = self._poller.poll(remaining_time)
+        # Our calculation uses seconds, poll() wants milliseconds
+        result = self._poller.poll(1000 * remaining_time)
       except EnvironmentError, err:
         if err.errno != errno.EINTR:
           raise