diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..0325a6c
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+build/
+.pybuild/
diff --git a/debian/control b/debian/control
index 3bde884..415d5b0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,24 @@ Maintainer: Dave Jones <dave@waveform.org.uk>
 Homepage: http://sense-emu.readthedocs.io/
 Section: python
 Priority: extra
-Build-Depends: debhelper (>= 8), python-all (>= 2.7), python-setuptools, python3-all, python3-setuptools, python-sphinx (>= 1.0.7+dfsg-1~)
+Build-Depends:
+ debhelper (>= 8),
+ dh-python,
+ python-all (>= 2.7),
+ python-setuptools,
+ python3-all,
+ python3-setuptools,
+ python3-sphinx
 Standards-Version: 3.9.6
+Vcs-Git: https://github.com/RPi-Distro/python-sense-emu.git
+Vcs-Browser: https://github.com/RPi-Distro/python-sense-emu
 X-Python-Version: >= 2.7
 X-Python3-Version: >= 3.2
 
 Package: python-sense-emu
 Architecture: all
 Section: python
-Depends: ${misc:Depends}, ${python:Depends}, python-numpy, python-pil
+Depends: ${misc:Depends}, ${python:Depends}, python-numpy, python-pil, python-pkg-resources
 Recommends: sense-emu-tools
 Description: Client library for the Raspberry Pi Sense HAT emulator.
  sense-emu is an emulator of the Raspberry Pi Sense HAT which runs on multiple
@@ -26,7 +35,7 @@ Description: Client library for the Raspberry Pi Sense HAT emulator.
 Package: python3-sense-emu
 Architecture: all
 Section: python
-Depends: ${misc:Depends}, ${python3:Depends}, python3-numpy, python3-pil
+Depends: ${misc:Depends}, ${python3:Depends}, python3-numpy, python3-pil, python3-pkg-resources
 Recommends: sense-emu-tools
 Description: Client library for the Raspberry Pi Sense HAT emulator.
  sense-emu is an emulator of the Raspberry Pi Sense HAT which runs on multiple
diff --git a/debian/copyright b/debian/copyright
index a1e02de..272faa9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -43,4 +43,3 @@ License: LGPL-2.1+
  .
  On Debian systems, the complete text of the GNU Lesser General Public License
  version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
-
diff --git a/debian/rules b/debian/rules
index e86f3ce..2baaf66 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,14 +4,13 @@
 #export DH_VERBOSE=1
 export DH_OPTIONS
 
+export PYBUILD_NAME=senseemu
+
 %:
-	dh $@ --with python2,python3,sphinxdoc --buildsystem=python_distutils
+	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_auto_install:
-	# Perform a full installation of each of the packages
-	python setup.py install --root debian/python-sense-emu --install-layout=deb
-	python3 setup.py install --root debian/python3-sense-emu --install-layout=deb
-	python3 setup.py install --root debian/sense-emu-tools --install-layout=deb
+	dh_auto_install
 	# Strip out source from the tools package
 	rm -fr debian/sense-emu-tools/usr/lib
 	rm -fr debian/sense-emu-tools/usr/share/pyshared
@@ -26,7 +25,7 @@ override_dh_auto_install:
 #override_dh_auto_test:
 #	# Don't run the tests!
 
-override_dh_installdocs:
-	python setup.py build_sphinx -b html
-	dh_installdocs
-
+override_dh_auto_build:
+	dh_auto_build
+	PYTHONPATH=. sphinx-build -N -bhtml docs/ build/html
+	PYTHONPATH=. sphinx-build -N -bman docs/ build/man