diff --git a/Makefile.am b/Makefile.am
index 227b5a11a9edacbb4d84fc12fdd9f4ff70626d07..936f2c95c0681ccff2c383cd1245f0c3f30f8d1c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,6 +83,7 @@ clientdir = $(pkgpythondir)/client
 cmdlibdir = $(pkgpythondir)/cmdlib
 hypervisordir = $(pkgpythondir)/hypervisor
 hypervisor_hv_kvmdir = $(pkgpythondir)/hypervisor/hv_kvm
+jqueuedir = $(pkgpythondir)/jqueue
 storagedir = $(pkgpythondir)/storage
 httpdir = $(pkgpythondir)/http
 masterddir = $(pkgpythondir)/masterd
@@ -180,6 +181,7 @@ DIRS = \
 	lib/client \
 	lib/cmdlib \
 	lib/confd \
+	lib/jqueue \
 	lib/http \
 	lib/hypervisor \
 	lib/hypervisor/hv_kvm \
@@ -375,7 +377,6 @@ pkgpython_PYTHON = \
 	lib/errors.py \
 	lib/hooksmaster.py \
 	lib/ht.py \
-	lib/jqueue.py \
 	lib/jstore.py \
 	lib/locking.py \
 	lib/luxi.py \
@@ -447,6 +448,9 @@ hypervisor_hv_kvm_PYTHON = \
   lib/hypervisor/hv_kvm/monitor.py \
   lib/hypervisor/hv_kvm/netdev.py
 
+jqueue_PYTHON = \
+	lib/jqueue/__init__.py
+
 storage_PYTHON = \
 	lib/storage/__init__.py \
 	lib/storage/bdev.py \
@@ -1665,6 +1669,7 @@ all_python_code = \
 	$(cmdlib_PYTHON) \
 	$(hypervisor_PYTHON) \
 	$(hypervisor_hv_kvm_PYTHON) \
+	$(jqueue_PYTHON) \
 	$(storage_PYTHON) \
 	$(rapi_PYTHON) \
 	$(server_PYTHON) \
diff --git a/lib/jqueue.py b/lib/jqueue/__init__.py
similarity index 100%
rename from lib/jqueue.py
rename to lib/jqueue/__init__.py