diff --git a/Scripts/genversion.sh b/Scripts/genversion.sh
index b059a51b8..6895f42db 100755
--- a/Scripts/genversion.sh
+++ b/Scripts/genversion.sh
@@ -10,8 +10,9 @@ echo "short_version=${short_version}"
 echo "build_time=${build_time}"
 
 info_plist="${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}"
-/usr/libexec/PlistBuddy -c "Set :CFBundleVersion '${git_version}'" "${info_plist}"
+/usr/libexec/PlistBuddy -c "Set :CFBundleVersion '${short_version}'" "${info_plist}"
 /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString '${short_version}'" "${info_plist}"
+/usr/libexec/PlistBuddy -c "Add :GitVersion string '${git_version}'" "${info_plist}"
 /usr/libexec/PlistBuddy -c "Add :BuildTime date '${build_time}'" "${info_plist}"
 
 exit 0
diff --git a/Window/AboutWindowController.swift b/Window/AboutWindowController.swift
index 757de07ee..6d9dc7605 100644
--- a/Window/AboutWindowController.swift
+++ b/Window/AboutWindowController.swift
@@ -38,7 +38,7 @@ class AboutWindowController: NSWindowController {
         appName.stringValue = Bundle.main.object(forInfoDictionaryKey: "CFBundleName") as! String
         
         let shortVersionString = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as! String
-        let fullVersionString = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as! String
+        let fullVersionString = Bundle.main.object(forInfoDictionaryKey: "GitVersion") as! String
         
         appVersion.stringValue = String.localizedStringWithFormat(            NSLocalizedString("Version %@ (%@)", comment: "Version string"), shortVersionString, fullVersionString);