diff --git a/Makefile b/Makefile
index ce681a2..5447707 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,10 @@ packages: packages-rpm
 tools/mk_macports.vcs_blackbox.txt: tools/mk_rpm_fpmdir.stack_blackbox.txt
 	sed -e 's@/usr/blackbox/bin/@bin/@g' -e '/profile.d-usrblackbox.sh/d' <tools/mk_rpm_fpmdir.stack_blackbox.txt >$@
 
+# Make mk_deb_fpmdir.vcs_blackbox.txt from mk_rpm_fpmdir.stack_blackbox.txt:
+tools/mk_deb_fpmdir.stack_blackbox.txt: tools/mk_rpm_fpmdir.stack_blackbox.txt
+	sed -e 's@/usr/blackbox/bin/@/usr/bin/@g' -e '/profile.d-usrblackbox.sh/d' <tools/mk_deb_fpmdir.stack_blackbox.txt >$@
+
 check-destdir:
 	ifndef DESTDIR
 	  $(error DESTDIR is undefined)
@@ -65,10 +69,10 @@ unlock-rpm:
 # DEB builds
 #
 
-packages-deb:
+packages-deb:	tools/mk_deb_fpmdir.stack_blackbox.txt
 	cd tools && PKGRELEASE="$${PKGRELEASE}" PKGDESCRIPTION="Safely store secrets in git/hg/svn repos using GPG encryption" ./mk_deb_fpmdir stack_blackbox mk_deb_fpmdir.stack_blackbox.txt
 
-packages-deb-debug:
+packages-deb-debug:	tools/mk_deb_fpmdir.stack_blackbox.txt
 	@echo BUILD:
 	@PKGRELEASE=99 make packages-deb
 	@echo ITEMS TO BE PACKAGED:
diff --git a/tools/mk_deb_fpmdir.stack_blackbox.txt b/tools/mk_deb_fpmdir.stack_blackbox.txt
index de4731e..3e0b752 100644
--- a/tools/mk_deb_fpmdir.stack_blackbox.txt
+++ b/tools/mk_deb_fpmdir.stack_blackbox.txt
@@ -1,15 +1,14 @@
-read /etc/profile.d/usrblackbox.sh               profile.d-usrblackbox.sh
-exec /usr/blackbox/bin/_blackbox_common.sh       ../bin/_blackbox_common.sh
-exec /usr/blackbox/bin/_stack_lib.sh             ../bin/_stack_lib.sh
-exec /usr/blackbox/bin/blackbox_addadmin         ../bin/blackbox_addadmin
-exec /usr/blackbox/bin/blackbox_cat              ../bin/blackbox_cat
-exec /usr/blackbox/bin/blackbox_edit             ../bin/blackbox_edit
-exec /usr/blackbox/bin/blackbox_edit_end         ../bin/blackbox_edit_end
-exec /usr/blackbox/bin/blackbox_edit_start       ../bin/blackbox_edit_start
-exec /usr/blackbox/bin/blackbox_initialize       ../bin/blackbox_initialize
-exec /usr/blackbox/bin/blackbox_postdeploy       ../bin/blackbox_postdeploy
-exec /usr/blackbox/bin/blackbox_register_new_file ../bin/blackbox_register_new_file
-exec /usr/blackbox/bin/blackbox_removeadmin      ../bin/blackbox_removeadmin
-exec /usr/blackbox/bin/blackbox_shred_all_files  ../bin/blackbox_shred_all_files
-exec /usr/blackbox/bin/blackbox_update_all_files ../bin/blackbox_update_all_files
-exec /usr/blackbox/bin/blackbox_list_files       ../bin/blackbox_list_files
+exec /usr/bin/_blackbox_common.sh       ../bin/_blackbox_common.sh
+exec /usr/bin/_stack_lib.sh             ../bin/_stack_lib.sh
+exec /usr/bin/blackbox_addadmin         ../bin/blackbox_addadmin
+exec /usr/bin/blackbox_cat              ../bin/blackbox_cat
+exec /usr/bin/blackbox_edit             ../bin/blackbox_edit
+exec /usr/bin/blackbox_edit_end         ../bin/blackbox_edit_end
+exec /usr/bin/blackbox_edit_start       ../bin/blackbox_edit_start
+exec /usr/bin/blackbox_initialize       ../bin/blackbox_initialize
+exec /usr/bin/blackbox_postdeploy       ../bin/blackbox_postdeploy
+exec /usr/bin/blackbox_register_new_file ../bin/blackbox_register_new_file
+exec /usr/bin/blackbox_removeadmin      ../bin/blackbox_removeadmin
+exec /usr/bin/blackbox_shred_all_files  ../bin/blackbox_shred_all_files
+exec /usr/bin/blackbox_update_all_files ../bin/blackbox_update_all_files
+exec /usr/bin/blackbox_list_files       ../bin/blackbox_list_files