diff --git a/macosx/Makefile b/macosx/Makefile
index a6f75fa59..08955b11b 100644
--- a/macosx/Makefile
+++ b/macosx/Makefile
@@ -4,11 +4,12 @@
 NMAP_VERSION := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_VERSION' ../nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q')
 NMAP_NUM_VERSION := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_NUM_VERSION' ../nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q')
 
-STAGING_DIR = Zenmap-$(NMAP_VERSION)
+IMAGE_NAME = Zenmap-$(NMAP_VERSION)$(if $(APPENDAGE),-$(APPENDAGE))
+STAGING_DIR = $(IMAGE_NAME)
 
 DIST_FILES = $(addprefix $(STAGING_DIR)/,Zenmap.app COPYING README)
 
-Zenmap-$(NMAP_VERSION).dmg: $(DIST_FILES)
+$(IMAGE_NAME).dmg: $(DIST_FILES)
 	rm -f $@
 	hdiutil create -imagekey zlib-level=9 -srcfolder $(STAGING_DIR) $@
 
@@ -27,6 +28,6 @@ $(STAGING_DIR)/COPYING:
 
 clean:
 	rm -rf $(STAGING_DIR)
-	rm -f Zenmap-$(NMAP_VERSION).dmg
+	rm -f $(IMAGE_NAME).dmg
 
 .PHONY: clean