diff --git a/debian/rules b/debian/rules
index d0ebfa4..49bdd90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,11 @@
 #!/usr/bin/make -f
 
-export PYBUILD_NAME=swh-lister
-export PYBUILD_TEST_ARGS=--with-doctest -sv -a !db,!fs swh/lister
+export PYBUILD_NAME=swh.lister
+export export PYBUILD_TEST_ARGS=--with-doctest -sv -a !db,!fs
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
+
+override_dh_install:
+	dh_install
+	rm -v $(CURDIR)/debian/python3-*/usr/lib/python*/dist-packages/swh/__init__.py
diff --git a/setup.py b/setup.py
index 74ec27b..e1d86ac 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from setuptools import setup
+from setuptools import setup, find_packages
 
 
 def parse_requirements():
@@ -21,7 +21,7 @@ setup(
     author='Software Heritage developers',
     author_email='swh-devel@inria.fr',
     url='https://forge.softwareheritage.org/diffusion/DLSGH/',
-    packages=['swh.lister'],
+    packages=find_packages(),
     scripts=['bin/ghlister'],
     install_requires=parse_requirements(),
     setup_requires=['vcversioner'],
diff --git a/swh/__init__.py b/swh/__init__.py
new file mode 100644
index 0000000..69e3be5
--- /dev/null
+++ b/swh/__init__.py
@@ -0,0 +1 @@
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)