diff --git a/debian/control b/debian/control
index 43d07ec..2f7cf37 100644
--- a/debian/control
+++ b/debian/control
@@ -1,25 +1,30 @@
 Source: swh-storage
 Maintainer: Software Heritage developers <swh-devel@inria.fr>
 Section: python
 Priority: optional
 Build-Depends: debhelper (>= 9),
                dh-python,
                python3-all,
                python3-dateutil,
                python3-flask,
                python3-nose,
                python3-psycopg2,
                python3-requests,
                python3-setuptools,
                python3-swh.core (>= 0.0.21~),
                python3-swh.objstorage (>= 0.0.2~),
                python3-vcversioner,
                python3-swh.scheduler,
                python3-click
 Standards-Version: 3.9.6
 Homepage: https://forge.softwareheritage.org/diffusion/DSTO/
 
 Package: python3-swh.storage
 Architecture: all
 Depends: python3-swh.core (>= 0.0.21~), python3-swh.objstorage (>= 0.0.2~), ${misc:Depends}, ${python3:Depends}
 Description: Software Heritage storage utilities
+
+Package: python3-swh.storage.listener
+Architecture: all
+Depends: python3-swh.storage (= ${binary:Version}), ${misc:Depends}, ${python3:Depends}, python3-kafka (>= 1.3.1)
+Description: Software Heritage storage listener
diff --git a/debian/rules b/debian/rules
index 73ffb1b..c716076 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,20 @@
 #!/usr/bin/make -f
 
-# This file was automatically generated by stdeb 0.8.5 at
-# Tue, 22 Sep 2015 12:05:09 +0200
-export PYBUILD_NAME=swh-storage
+export PYBUILD_NAME=swh.storage
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
 
+override_dh_install:
+	dh_install
+	for pyvers in $(shell py3versions -vr); do \
+		mkdir -p $(CURDIR)/debian/python3-swh.storage.listener/usr/lib/python$$pyvers/dist-packages/swh/storage/ ; \
+		mv $(CURDIR)/debian/python3-swh.storage/usr/lib/python$$pyvers/dist-packages/swh/storage/listener.py \
+		   $(CURDIR)/debian/python3-swh.storage.listener/usr/lib/python$$pyvers/dist-packages/swh/storage/ ; \
+	done
+
 override_dh_auto_test:
 	PYBUILD_SYSTEM=custom \
         PYBUILD_TEST_ARGS="cd {build_dir}; python{version} -m nose swh -sva '!db'" \
         dh_auto_test