diff --git a/build/conf/mac/Contents/Info.plist b/build/conf/mac/Contents/Info.plist
index 638c216891b9..fe7797ee1356 100644
--- a/build/conf/mac/Contents/Info.plist
+++ b/build/conf/mac/Contents/Info.plist
@@ -46,6 +46,10 @@
     <string>@@build@@</string>
     <key>LSApplicationCategoryType</key>
     <string>public.app-category.developer-tools</string>
+    <key>CFBundleHelpBookName</key>
+    <string>JetBrains.@@help_id@@.help</string>
+    <key>CFBundleHelpBookFolder</key>
+    <string>@@help_id@@.help</string>
 
     <key>LSArchitecturePriority</key>
     <array>
diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index 87a94aad2957..09ebb86f8101 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -236,11 +236,16 @@ binding.setVariable("layoutMacApp", { String path, String ch, Map args ->
   }
 
   String executable = args.executable != null ? args.executable : p("component.names.product").toLowerCase()
+  String helpId = args.help_id != null ? args.help_id : "IJ"
   String icns = "idea.icns"
+  String helpIcns = "$path/Contents/Resources/${helpId}.help/Contents/Resources/Shared/product.icns"
   if (args.icns != null) {
     ant.delete(file: "$path/Contents/Resources/idea.icns")
     ant.copy(file: args.icns, todir: "$path/Contents/Resources")
+    ant.copy(file: args.icns, tofile: helpIcns)
     icns = new File((String)args.icns).getName();
+  } else {
+    ant.copy(file: "$path/Contents/Resources/idea.icns", tofile: helpIcns)
   }
 
   String fullName = args.fullName != null ? args.fullName : p("component.names.fullname")
@@ -270,6 +275,7 @@ binding.setVariable("layoutMacApp", { String path, String ch, Map args ->
     replacefilter(token: "@@vmoptions64@@", value: "$mem64 -XX:+UseCompressedOops")
     replacefilter(token: "@@idea_properties@@", value: properties)
     replacefilter(token: "@@class_path@@", value: classPath)
+    replacefilter(token: "@@help_id@@", value: helpId)
   }
 
   if (executable != "idea") {
diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties
index a85422a2a634..ffc4f5c61dc1 100644
--- a/platform/platform-resources-en/src/misc/registry.properties
+++ b/platform/platform-resources-en/src/misc/registry.properties
@@ -110,7 +110,7 @@ ide.mac.message.dialogs.as.sheets=true
 ide.mac.inplaceDialogMnemonicsFix=true
 ide.mac.fix.dialog.showing=false
 ide.mac.hide.cursor.when.typing=true
-ide.mac.show.native.help=false
+ide.mac.show.native.help=true
 ide.mac.useNativeClipboard=false
 
 debugger.valueTooltipAutoShow=true