diff --git a/src/MacVim/Info.plist b/src/MacVim/Info.plist
index 01fb101d15..a90f8561a1 100644
--- a/src/MacVim/Info.plist
+++ b/src/MacVim/Info.plist
@@ -1238,7 +1238,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>8.0</string>
+	<string>${VIM_SHORT_VERSION_STRING}</string>
 	<key>CFBundleSignature</key>
 	<string>VIMM</string>
 	<key>CFBundleURLTypes</key>
diff --git a/src/auto/configure b/src/auto/configure
index 49a1ae358d..9bafc897d2 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -14192,6 +14192,11 @@ $as_echo "using default" >&6; }
 fi
 
 
+    vim_short_version_string=`grep 'define.*VIM_VERSION_SHORT' $srcdir/version.h|sed -E -e 's/.*"([0-9.]*)".*/\1/'`
+  snapshot=`grep -C2 "Add new patch number below this line" $srcdir/version.c|tail -1|sed -E -e 's/^ *([0-9]+),.*/\1/'`
+  vim_short_version_string="$vim_short_version_string.$snapshot"
+  XCODEFLAGS="$XCODEFLAGS VIM_SHORT_VERSION_STRING=$vim_short_version_string"
+
 
 fi
 
diff --git a/src/configure.ac b/src/configure.ac
index 04154a480b..a875bf1c8d 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -4347,6 +4347,12 @@ if test "x$MACOSX" = "xyes"; then
       AC_MSG_RESULT($withval) ],
     [ AC_MSG_RESULT(using default) ])
 
+  dnl Set CFBundleShortVersionString of Info.plist
+  vim_short_version_string=`grep 'define.*VIM_VERSION_SHORT' $srcdir/version.h|sed -E -e 's/.*"([[0-9.]]*)".*/\1/'`
+  snapshot=`grep -C2 "Add new patch number below this line" $srcdir/version.c|tail -1|sed -E -e 's/^ *([[0-9]]+),.*/\1/'`
+  vim_short_version_string="$vim_short_version_string.$snapshot"
+  XCODEFLAGS="$XCODEFLAGS VIM_SHORT_VERSION_STRING=$vim_short_version_string"
+
   AC_SUBST(XCODEFLAGS)
 fi