diff --git a/.gitignore b/.gitignore
index 30cf74e28..b3a121c2f 100755
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
 .qmake.stash
 *.autosave
 /ZeroTier One.zip
+/ZeroTier One.dmg
diff --git a/make-mac.mk b/make-mac.mk
index 598ff783e..f4eddb46c 100644
--- a/make-mac.mk
+++ b/make-mac.mk
@@ -57,15 +57,22 @@ mac-ui: FORCE
 install-mac-tap: FORCE
 	mkdir -p /Library/Application\ Support/ZeroTier/One
 	rm -rf /Library/Application\ Support/ZeroTier/One/tap.kext
-	cp -R ext/bin/tap-mac//tap.kext /Library/Application\ Support/ZeroTier/One
+	cp -R ext/bin/tap-mac/tap.kext /Library/Application\ Support/ZeroTier/One
 	chown -R root:wheel /Library/Application\ Support/ZeroTier/One/tap.kext
 
 clean:
-	rm -rf *.dSYM build-* $(OBJS) zerotier-* ZeroTierOneInstaller-*
+	rm -rf *.dSYM build-* $(OBJS) zerotier-* ZeroTierOneInstaller-* "ZeroTier One.zip" "ZeroTier One.dmg"
 
 official: FORCE
 	make -j 4 ZT_OFFICIAL_RELEASE=1
 	make mac-ui ZT_OFFICIAL_RELEASE=1
 	./buildinstaller.sh
+	mkdir build-ZeroTierOne-dmg
+	cd build-ZeroTierOne-dmg ; ln -sf /Applications Applications
+	cp -a "build-ZeroTierUI-release/ZeroTier One.app" build-ZeroTierOne-dmg/
+	rm -f /tmp/tmp.dmg
+	hdiutil create /tmp/tmp.dmg -ov -volname "ZeroTier One" -fs HFS+ -srcfolder ./build-ZeroTierOne-dmg
+	hdiutil convert /tmp/tmp.dmg -format UDZO -o "ZeroTier One.dmg"
+	rm -f /tmp/tmp.dmg
 
 FORCE: