diff --git a/Makefile b/Makefile
index 70ffcf23..7f8b9cc1 100644
--- a/Makefile
+++ b/Makefile
@@ -116,6 +116,9 @@ ifeq ($(ARCH), mac)
 
 	mkdir -p $(BUNDLE)/Contents/Resources/plugins
 	cp -R plugins/Fundamental/dist/Fundamental $(BUNDLE)/Contents/Resources/plugins
+	# Make DMG image
+	cd dist && ln -s /Applications Applications
+	cd dist && hdiutil create -srcfolder . -volname Rack -ov -format UDZO Rack-$(VERSION)-$(ARCH).dmg
 endif
 ifeq ($(ARCH), win)
 	mkdir -p dist/Rack
@@ -135,6 +138,11 @@ ifeq ($(ARCH), win)
 	cp dep/bin/portaudio_x64.dll dist/Rack/
 	mkdir -p dist/Rack/plugins
 	cp -R plugins/Fundamental/dist/Fundamental dist/Rack/plugins/
+	# Make ZIP
+	cd dist && zip -5 -r Rack-$(VERSION)-$(ARCH).zip Rack
+	# Make NSIS installer
+	makensis installer.nsi
+	mv Rack-setup.exe dist/Rack-$(VERSION)-$(ARCH).exe
 endif
 ifeq ($(ARCH), lin)
 	mkdir -p dist/Rack
@@ -149,16 +157,10 @@ ifeq ($(ARCH), lin)
 	cp dep/lib/libportaudio.so.2 dist/Rack/
 	cp dep/lib/librtmidi.so.4 dist/Rack/
 	mkdir -p dist/Rack/plugins
+	# Make ZIP
 	cp -R plugins/Fundamental/dist/Fundamental dist/Rack/plugins/
 endif
 
-ifeq ($(ARCH), mac)
-	cd dist && ln -s /Applications Applications
-	cd dist && hdiutil create -srcfolder . -volname Rack -ov -format UDZO Rack-$(VERSION)-$(ARCH).dmg
-else
-	cd dist && zip -5 -r Rack-$(VERSION)-$(ARCH).zip Rack
-endif
-
 
 # Plugin helpers
 
diff --git a/installer-banner.bmp b/installer-banner.bmp
index d3f732ee..616104b3 100644
Binary files a/installer-banner.bmp and b/installer-banner.bmp differ
diff --git a/installer.nsi b/installer.nsi
index c6fc468a..d347c4b8 100644
--- a/installer.nsi
+++ b/installer.nsi
@@ -20,9 +20,9 @@ RequestExecutionLevel admin
 !define MUI_ICON "icon.ico"
 
 !define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\nsis.bmp" ; 150x57
-!define MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp" ; 164x314
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP  "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp" ; 164x314
+!define MUI_HEADERIMAGE_BITMAP "installer-banner.bmp" ; 150x57
+; !define MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp" ; 164x314
+; !define MUI_UNWELCOMEFINISHPAGE_BITMAP  "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp" ; 164x314
 !define MUI_COMPONENTSPAGE_NODESC