diff --git a/CMakeLists.txt b/CMakeLists.txt
index 069289fff6..cdb979e638 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,11 +39,10 @@ endif()
 project(${_project_name} C CXX)
 
 # Updated by tools/make-version.pl
-set(GIT_REVISION 0)
 set(PROJECT_MAJOR_VERSION 3)
 set(PROJECT_MINOR_VERSION 7)
 set(PROJECT_PATCH_VERSION 2)
-set(PROJECT_BUILD_VERSION ${GIT_REVISION})
+set(PROJECT_BUILD_VERSION 0)
 set(PROJECT_VERSION_EXTENSION "")
 
 if(DEFINED ENV{WIRESHARK_VERSION_EXTRA})
diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt
index b20611ac05..6f229fe0cd 100644
--- a/packaging/wix/CMakeLists.txt
+++ b/packaging/wix/CMakeLists.txt
@@ -69,14 +69,12 @@ else()
 	message(FATAL_ERROR "Your mysterious moon-man architecture \"${WIRESHARK_TARGET_PLATFORM}\" frightens and confuses us.")
 endif()
 
-set(PRODUCT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}.${PROJECT_BUILD_VERSION})
-
 # To do:
 # - Sync the various version names between CMake and Wix.
 # - Set CMakeLists.txt version strings in tools/make-version.pl
 # - Add a VERSION_EXTRA cmake option
 set (VERSION "${PROJECT_VERSION}")
-set (PRODUCT_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUILD})
+set(PRODUCT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}.${PROJECT_BUILD_VERSION})
 
 # Use the merge module that comes with our version of Visual Studio
 if(MSVC_VERSION GREATER_EQUAL 1930)
diff --git a/tools/make-version.pl b/tools/make-version.pl
index c4bdeebc8b..121fe1e18e 100755
--- a/tools/make-version.pl
+++ b/tools/make-version.pl
@@ -318,10 +318,10 @@ Fin
 
 # Read CMakeLists.txt, then write it back out with updated "set(PROJECT_..._VERSION ...)
 # lines
-# set(GIT_REVISION 999)
 # set(PROJECT_MAJOR_VERSION 1)
 # set(PROJECT_MINOR_VERSION 99)
 # set(PROJECT_PATCH_VERSION 0)
+# set(PROJECT_BUILD_VERSION 999)
 # set(PROJECT_VERSION_EXTENSION "-rc5")
 sub update_cmakelists_txt
 {
@@ -334,14 +334,14 @@ sub update_cmakelists_txt
 
 	open(CFGIN, "< $filepath") || die "Can't read $filepath!";
 	while ($line = <CFGIN>) {
-		if ($line =~ /^set *\( *GIT_REVISION .*?([\r\n]+)$/) {
-			$line = sprintf("set(GIT_REVISION %d)$1", $num_commits);
-		} elsif ($line =~ /^set *\( *PROJECT_MAJOR_VERSION .*?([\r\n]+)$/) {
+		if ($line =~ /^set *\( *PROJECT_MAJOR_VERSION .*?([\r\n]+)$/) {
 			$line = sprintf("set(PROJECT_MAJOR_VERSION %d)$1", $version_major);
 		} elsif ($line =~ /^set *\( *PROJECT_MINOR_VERSION .*?([\r\n]+)$/) {
 			$line = sprintf("set(PROJECT_MINOR_VERSION %d)$1", $version_minor);
 		} elsif ($line =~ /^set *\( *PROJECT_PATCH_VERSION .*?([\r\n]+)$/) {
 			$line = sprintf("set(PROJECT_PATCH_VERSION %d)$1", $version_micro);
+		} elsif ($line =~ /^set *\( *PROJECT_BUILD_VERSION .*?([\r\n]+)$/) {
+			$line = sprintf("set(PROJECT_BUILD_VERSION %d)$1", $num_commits);
 		} elsif ($line =~ /^set *\( *PROJECT_VERSION_EXTENSION .*?([\r\n]+)$/) {
 			$line = sprintf("set(PROJECT_VERSION_EXTENSION \"%s\")$1", $package_string);
 		}