diff --git a/Makefile.nmake b/Makefile.nmake
index 13ad579029..bcb2480d68 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -274,8 +274,8 @@ wireshark.bsc:
 
 pdb_zip: all
 	cd $(INSTALL_DIR)
-	rm -f ../wireshark-pdb-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).zip
-	zip -9 ../wireshark-pdb-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).zip *.pdb *.lib
+	rm -f ../[Ww]ireshark-pdb-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).zip
+	zip -9 ../Wireshark-pdb-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).zip *.pdb *.lib
 	cd ..
 
 $(RESOURCES): image
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index ecb3f35105..235b92c620 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -49,7 +49,7 @@ VIProductVersion "${PRODUCT_VERSION}"
 
 
 ; The file to write
-OutFile "wireshark-${WIRESHARK_TARGET_PLATFORM}-${VERSION}.exe"
+OutFile "${PROGRAM_NAME}-${WIRESHARK_TARGET_PLATFORM}-${VERSION}.exe"
 
 ; Icon of installer and uninstaller
 Icon "..\..\image\wiresharkinst.ico"
diff --git a/packaging/u3/win32/Makefile.nmake b/packaging/u3/win32/Makefile.nmake
index e7500613cd..749e692337 100644
--- a/packaging/u3/win32/Makefile.nmake
+++ b/packaging/u3/win32/Makefile.nmake
@@ -95,7 +95,7 @@ test:		pack
 	wireshark.bat -D
 
 package:	verify-tools test
-	zip -r wireshark-$(VERSION).u3p $(MANIFEST) $(DEVICE) $(DATA) $(HOST) wireshark.bat
+	zip -r Wireshark-$(VERSION).u3p $(MANIFEST) $(DEVICE) $(DATA) $(HOST) wireshark.bat
 
 CFLAGS	= -DWINPCAP_PACKAGE="\"\\\\WinPcap_$(PCAP_VERSION).exe\""