diff --git a/nipap-cli/Makefile b/nipap-cli/Makefile
index 99aad8a5b..998e32132 100644
--- a/nipap-cli/Makefile
+++ b/nipap-cli/Makefile
@@ -27,8 +27,8 @@ buildrpm:
 builddeb:
 	# build the source package in the parent directory
 	# then rename it to project_version.orig.tar.gz
-	$(PYTHON) setup.py sdist --dist-dir=../
-	rename -f 's/$(PROJECT)-(.*)\.tar\.gz/$(PROJECT)_$$1\.orig\.tar\.gz/' ../*
+	$(PYTHON) -m build --sdist --outdir=../
+	rename -f 's/nipap_cli-(.*)\.tar\.gz/$(PROJECT)_$$1\.orig\.tar\.gz/' ../*
 	# build the package
 	debuild -us -uc
 
@@ -45,7 +45,7 @@ clean:
 	rm -rf .pybuild/ MANIFEST dist/ debian/tmp debian/$(PROJECT) debian/files \
 		.pc/ debian/$(PROJECT).debhelper.log debian/$(PROJECT).postinst.debhelper \
 		debian/$(PROJECT).prerm.debhelper debian/$(PROJECT).substvars nipap.1 \
-		debian/.debhelper debian/debhelper-build-stamp
+		debian/.debhelper debian/debhelper-build-stamp nipap_cli.egg-info
 	find . -name '*.pyc' -delete
 
 VER := $(shell head -n1 ../NEWS | awk '{print $$2}')
diff --git a/nipap-cli/debian/compat b/nipap-cli/debian/compat
deleted file mode 100644
index f599e28b8..000000000
--- a/nipap-cli/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/nipap-cli/debian/control b/nipap-cli/debian/control
index 09397b86d..e6d0e2b08 100644
--- a/nipap-cli/debian/control
+++ b/nipap-cli/debian/control
@@ -2,12 +2,17 @@ Source: nipap-cli
 Maintainer: Lukas Garberg <lukas@spritelink.net>
 Section: python
 Priority: optional
-Build-Depends: python3 (>= 3.1), dh-python, debhelper (>= 10), python3-setuptools
-Standards-Version: 4.4.0
+Build-Depends: debhelper-compat (= 13),
+               dh-python,
+               dh-exec,
+               python3-all,
+               python3-setuptools,
+               bash-completion
+Standards-Version: 4.6.1
 
 Package: nipap-cli
 Architecture: all
-Depends: ${misc:Depends}, python3 (>= 3.1), python3-ipy, python3-pynipap
+Depends: ${misc:Depends}, ${python3:Depends}
 Description: Neat IP Address Planner
  The Neat IP Address Planner, NIPAP, is a system built for efficiently managing
  large amounts of IP addresses. This is the shell command.
diff --git a/nipap-cli/debian/install b/nipap-cli/debian/install
new file mode 100755
index 000000000..e6a3f40ff
--- /dev/null
+++ b/nipap-cli/debian/install
@@ -0,0 +1,2 @@
+#!/usr/bin/dh-exec
+nipaprc => /etc/.nipaprc
diff --git a/nipap-cli/debian/nipap-cli.bash-completion b/nipap-cli/debian/nipap-cli.bash-completion
new file mode 120000
index 000000000..41b76366a
--- /dev/null
+++ b/nipap-cli/debian/nipap-cli.bash-completion
@@ -0,0 +1 @@
+../bash_complete
\ No newline at end of file
diff --git a/nipap-cli/debian/rules b/nipap-cli/debian/rules
index 130a197a9..b6a6052c5 100755
--- a/nipap-cli/debian/rules
+++ b/nipap-cli/debian/rules
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
 
 #export DH_VERBOSE=1
-export PYBUILD_NAME=nipap-cli
-export PYBUILD_INSTALL_ARGS=--install-lib usr/lib/python3/dist-packages/
+#export PYBUILD_NAME=nipap-cli
+#export PYBUILD_INSTALL_ARGS=--install-lib usr/lib/python3/dist-packages/
 
 %:
-	dh $@ --with python3 --buildsystem=pybuild
+	dh $@ --with python3 --buildsystem=pybuild --with bash-completion
diff --git a/nipap-cli/debian/source/format b/nipap-cli/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/nipap-cli/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)