diff --git a/win32utils/makeversion.pl b/win32utils/makeversion.pl
index afae0fe55b..de812b4102 100644
--- a/win32utils/makeversion.pl
+++ b/win32utils/makeversion.pl
@@ -92,11 +92,16 @@ print OUTVERSIONFILE '
 
 ';
 
+if ($Versions{'PATCHVER'} != "") {
 $Version = "$Versions{'MAJORVER'}.$Versions{'MINORVER'}.$Versions{'PATCHVER'}";
+} else {
+	$Version = "$Versions{'MAJORVER'}.$Versions{'MINORVER'}";
+}
 $Version = "$Version$Versions{'RELEASETYPE'}$Versions{'RELEASEVER'}";
 print "BIND Version: $Version\n";
 
-print OUTVERSIONFILE "#define VERSION \"$Version\"\n\n";
+print OUTVERSIONFILE "#define VERSION \"$Version\"\n";
+print OUTVERSIONFILE "#define PRODUCT \"$Versions{'PRODUCT'}\"\n\n";
 
 foreach $dir (@dirlist) {
 	$apifile = "../lib/$dir/api";