diff --git a/Building/Windows/BuildInstall.iss b/Building/Windows/BuildInstall.iss
index 8a534c95..bd562061 100644
--- a/Building/Windows/BuildInstall.iss
+++ b/Building/Windows/BuildInstall.iss
@@ -63,7 +63,7 @@ VersionInfoProductName={#MyAppName}
 UninstallDisplayName={#MyGroupName}
 UninstallDisplayIcon={app}\{#MyAppExeName}
 
-VersionInfoVersion={#MyMajorVersion}.{#MyMinorVersion}.{#MyRevision}.{#MyBuildNumber}
+VersionInfoVersion={#MyVersionNumbers}
 VersionInfoProductTextVersion={#MyAppVersion}
 
 [Languages]
diff --git a/Building/Windows/getBuildInfo.awk b/Building/Windows/getBuildInfo.awk
index b2c526dc..2f2dece7 100644
--- a/Building/Windows/getBuildInfo.awk
+++ b/Building/Windows/getBuildInfo.awk
@@ -15,14 +15,17 @@
     version = $3
     print "#define MyAppVersion", version
 
-    split(version, v, "[\.\-]")
+    split(version, v, "[.-]")
     status = v[4] ? v[4] : "r"
     print "#define MyReleaseStatus \"" status "\""
     
-    split("alpha beta rc r", parts, " ")
+    split("alpha beta gamma rc r", parts, " ")
     for (i=1; i <= length(parts); i++) dict[parts[i]]=i
     build = dict[status]
-    print "#define MyBuildNumber \"" (build * 32) "\""
+    print "#define MyBuildNumber \"" (build * 100) "\""
+
+    # v[1] already includes a leading quote mark
+    print "#define MyVersionNumbers " v[1] "." v[2] "." v[3] "." (build * 100) "\""
 }
 
 /32.*bit/ { print "#define MyPlatform \"Win32\"" }
diff --git a/oscar/oscar.pro b/oscar/oscar.pro
index 6d950ce3..5bcada12 100644
--- a/oscar/oscar.pro
+++ b/oscar/oscar.pro
@@ -96,7 +96,7 @@ QMAKE_TARGET_DESCRIPTION = "OpenSource CPAP Analysis Reporter"
 _VERSION_FILE = $$cat(./VERSION)
 VERSION = $$section(_VERSION_FILE, '"', 1, 1)
 win32 {
-    VERSION=1.1.0.0
+    VERSION = $$section(VERSION, '-', 0, 0)
 }
 RC_ICONS = ./icons/logo.ico