diff --git a/Makefile b/Makefile
index 1ab2dcd..a10b80c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,12 @@
+include /usr/share/dpkg/pkg-info.mk
+
+SRCPACKAGE=rust-pathpatterns
+PACKAGE=lib$(SRCPACKAGE)-dev
+ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+DEB=$(PACKAGE)_$(DEB_VERSION)_$(ARCH).deb
+DSC=$(SRCPACKAGE)_$(DEB_VERSION)_$(ARCH).deb
+
 .PHONY: all
 all: check
 
@@ -27,12 +36,14 @@ build:
 	cp build/pathpatterns/debian/control debian/control
 
 .PHONY: deb
-deb: build
+deb: build build/$(DEB)
+build/$(DEB): | build
 	(cd build/pathpatterns && CARGO=/usr/bin/cargo RUSTC=/usr/bin/rustc dpkg-buildpackage -b -uc -us)
 	lintian build/*.deb
 
 .PHONY: dsc
-dsc: build
+dsc: build build/$(DSC)
+build/$(DSC): | build
 	(cd build/pathpatterns && CARGO=/usr/bin/cargo RUSTC=/usr/bin/rustc dpkg-buildpackage -S -uc -us)
 	lintian build/*.dsc
 
@@ -41,9 +52,9 @@ clean:
 	rm -rf build *.deb *.dsc *.buildinfo *.changes *.orig.tar.gz
 	cargo clean
 
-upload: deb
-	cd build; \
-	    dcmd --deb rust-pathpatterns_*.changes \
-	    | grep -v '.changes$$' \
-	    | tar -cf- -T- \
-	    | ssh -X repoman@repo.proxmox.com upload --product devel --dist buster
+.PHONY: upload
+upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
+upload: build/$(DEB)
+	# check if working directory is clean
+	git diff --exit-code --stat && git diff --exit-code --stat --staged
+	tar -C build -cf - $(DEB) | ssh -X repoman@repo.proxmox.com upload --product devel --dist $(DEB_DISTRIBUTION)