diff --git a/Makefile b/Makefile
index 1ec2480..fa55837 100644
--- a/Makefile
+++ b/Makefile
@@ -118,28 +118,22 @@ init-debian: clean-debian tarball
 	cp .build/tarball/${PKG}.tar.gz .build/deb
 
 	tar -xzf .build/deb/${PKG}.tar.gz -C .build/deb
-	cd .build/deb/${PKG}
+	cd .build/deb/${PKG} && debmake
 
-	debmake
+	cp -f packaging/deb/control.in .build/deb/$(PKG)/debian/control
+	cp -f packaging/deb/rules .build/deb/$(PKG)/debian/rules
 
-	cp -f packaging/deb/control.in debian/control
-	cp -f packaging/deb/rules debian/rules
+	sed -i "s/@OFFLINE@/$(OFFLINE)/g" .build/deb/$(PKG)/debian/rules
 
-	sed -i "s/@OFFLINE@/$(OFFLINE)/g" debian/rules
-
-	rm -f debian/changelog
+	rm -f .build/deb/$(PKG)/debian/changelog
 
 deb: init-debian
-	cd .build/deb/${PKG}
-
 	# Remove the rust build depdency from the control file
-	sed -i "s/@RUST@//g" debian/control
+	sed -i "s/@RUST@//g" .build/deb/$(PKG)/debian/control
 
-	dch --create --distribution unstable --package $(PKG_NAME) --newversion $(VERSION)-$(REVISION) "Bugfix and improvements."
+	cd .build/deb/$(PKG) && dch --create --distribution unstable --package $(PKG_NAME) --newversion $(VERSION)-$(REVISION) "Bugfix and improvements."
 
-	printenv
-
-	debuild -e PATH -us -uc -b
+	cd .build/deb/$(PKG) && debuild --preserve-env -e PATH -us -uc -b
 
 check-ppa:
 	if [ $(OFFLINE) -eq 0 ]; then \