diff --git a/master.py b/master.py
index 3c16a75..e8f0dc4 100644
--- a/master.py
+++ b/master.py
@@ -11,7 +11,7 @@ import signal
 import subprocess
 import sys
 import time
-from multiprocessing import Pool, Queue, current_process, Lock
+from multiprocessing import Pool, current_process, Lock, JoinableQueue
 from queue import Empty
 
 import yaml
@@ -343,7 +343,7 @@ if __name__ == '__main__':
     setup_chroot()
     sync_marchs_with_config()
     update_svn2git()
-    q = Queue()
+    q = JoinableQueue()
 
     with Pool(config["build"]["worker"], initializer=run_worker) as pool:
         fill_queue()