diff --git a/config.nmake b/config.nmake
index 70e49bdf8a..009d692c9d 100644
--- a/config.nmake
+++ b/config.nmake
@@ -1018,6 +1018,7 @@ XMLLINT="xmllint"
 
 VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO)$(VERSION_EXTRA)
 RC_VERSION=$(VERSION_MAJOR),$(VERSION_MINOR),$(VERSION_MICRO),$(VERSION_BUILD)
+PRODUCT_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO).$(VERSION_BUILD)
 
 WTAP_VERSION=$(WTAP_VERSION_MAJOR).$(WTAP_VERSION_MINOR).$(WTAP_VERSION_MICRO)
 RC_WTAP_VERSION=$(WTAP_VERSION_MAJOR),$(WTAP_VERSION_MINOR),$(WTAP_VERSION_MICRO)
diff --git a/image/wiresharkinst.ico b/image/wiresharkinst.ico
index 0f589a6091..b43059377c 100644
Binary files a/image/wiresharkinst.ico and b/image/wiresharkinst.ico differ
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index e052766239..8aeaf0025c 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -139,6 +139,7 @@ wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $(
 	/DGTK_WIMP_RCSRC_DIR=$(GTK_WIMP_RCSRC_DIR) \
 	/DINTL_DLL=$(INTL_DLL) \
 	/DVERSION=$(VERSION) \
+	/DPRODUCT_VERSION=$(PRODUCT_VERSION) \
 	/DWTAP_VERSION=$(WTAP_VERSION) \
 !IF "$(C_ARES_DIR)" != ""
 	/DC_ARES_DIR=$(C_ARES_DIR) \
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index a3e902b5d6..cf9202d640 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -34,6 +34,20 @@ InstType "un.All (remove all)"
 
 Name "${PROGRAM_NAME} ${VERSION} (${BITS}-bit)"
 
+; 
+VIAddVersionKey "ProductName" "${PROGRAM_NAME}"
+VIAddVersionKey "Comments" "It's a great product with a great story to tell. I'm pumped!"
+VIAddVersionKey "CompanyName" "${PROGRAM_NAME} development team"
+; NSIS handles the copyright symbol correctly using CP-1252 but not UTF-8.
+VIAddVersionKey "LegalCopyright" "© Gerald Combs and many others"
+VIAddVersionKey "LegalTrademarks" "Wireshark and the 'fin' logo are registered trademarks of the Wireshark Foundation"
+VIAddVersionKey "FileDescription" "${PROGRAM_NAME} installer for ${BITS}-bit Windows"
+VIAddVersionKey "Language" "English"
+VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}"
+VIAddVersionKey "FileVersion" "${PRODUCT_VERSION}"
+VIProductVersion "${PRODUCT_VERSION}"
+
+
 ; The file to write
 OutFile "wireshark-${WIRESHARK_TARGET_PLATFORM}-${VERSION}.exe"