diff --git a/Makefile b/Makefile
index 3db6517..a7134b0 100644
--- a/Makefile
+++ b/Makefile
@@ -5,17 +5,24 @@ PKGNAME=stack_blackbox
 
 all:
 	@echo 'Menu:'
-	@echo '  make packages          Make all RPM packages'
+	@echo '  make packages          Make RPM packages'
 	@echo '  make install           (incomplete)
 
-packages:
-	PKGRELEASE="$${PKGRELEASE}" $(BIN)/build_rpm.sh stack_blackbox tools/rpm_filelist.txt
-
 install:
 	@echo 'To install, copy the files from bin to somewhere in your PATH.'
 	@echo 'Or, if you use RPMs, "make packages" and install the result.'
 
-packages-debug:
+# The default package type is RPM.
+packages: packages-rpm
+
+#
+# RPM builds
+#
+
+packages-rpm:
+	PKGRELEASE="$${PKGRELEASE}" $(BIN)/build_rpm.sh stack_blackbox tools/rpm_filelist.txt
+
+packages-rpm-debug:
 	@echo BUILD:
 	@PKGRELEASE=99 make packages
 	@echo ITEMS TO BE PACKAGED:
@@ -23,17 +30,23 @@ packages-debug:
 	@echo ITEMS ACTUALLY IN PACKAGE:
 	@rpm -qpl $$(cat ~/rpmbuild-$(PKGNAME)/bin-packages.txt)
 
-local:
+local-rpm:
 	@PKGRELEASE=1 make packages
 	-@sudo rpm -e $(PKGNAME)
 	sudo rpm -i $$(cat ~/rpmbuild-$(PKGNAME)/bin-packages.txt)
 
-lock:
+lock-rpm:
 	sudo yum versionlock add $(PKGNAME)
 
-unlock:
+unlock-rpm:
 	sudo yum versionlock clear
 
+# Add other package types here.
+
+#
+# System Test:
+#
+
 confidence:
 	@if [[ -e ~/.gnupg ]]; then echo ERROR: '~/.gnupg should not exist. If it does, bugs may polute your .gnupg configuration. If the code has no bugs everything will be fine. Do you feel lucky?'; false ; fi
 	@if which >/dev/null gpg-agent ; then pkill gpg-agent ; rm -rf /tmp/tmp.* ; fi