diff --git a/build/conf/mac/Contents/Info.plist b/build/conf/mac/Contents/Info.plist
index 997526582ef0..9fcd21c14315 100644
--- a/build/conf/mac/Contents/Info.plist
+++ b/build/conf/mac/Contents/Info.plist
@@ -31,7 +31,7 @@
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleName</key>
-    <string>@@bundle_name@@ @@version@@</string>
+    <string>@@bundle_name@@ @@product_version@@</string>
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleIdentifier</key>
diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index 2e68258aad9e..f93dd53fa8a2 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -367,6 +367,8 @@ binding.setVariable("layoutMacApp", { String path, String ch, Map args ->
 
   String minor = p("component.version.minor")
   String version = isEap() && !minor.contains("RC") && !minor.contains("Beta") ? "EAP $args.buildNumber" : "${p("component.version.major")}.${minor}"
+  String productVersion = "${p("component.version.major")}.${minor}"
+  if (isEap() && !minor.contains("RC") && !minor.contains("Beta")) productVersion += " EAP"
 
   Map properties = readIdeaProperties(args)
 
@@ -427,6 +429,7 @@ binding.setVariable("layoutMacApp", { String path, String ch, Map args ->
     replacefilter(token: "@@executable@@", value: executable)
     replacefilter(token: "@@icns@@", value: icns)
     replacefilter(token: "@@bundle_name@@", value: fullName)
+    replacefilter(token: "@@product_version@@", value: productVersion)
     replacefilter(token: "@@bundle_identifier@@", value: args.bundleIdentifier)
     replacefilter(token: "@@year@@", value: "$todayYear")
     replacefilter(token: "@@version@@", value: version)