diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuiltInHelpPlugin.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuiltInHelpPlugin.kt
index fd86db5e7ebd..576886869f35 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuiltInHelpPlugin.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuiltInHelpPlugin.kt
@@ -26,12 +26,11 @@ internal fun buildHelpPlugin(pluginVersion: String, context: BuildContext): Plug
     return null
   }
 
-  return PluginLayout.plugin(BUILT_IN_HELP_MODULE_NAME) { spec ->
+  return PluginLayout.pluginAutoWithCustomDirName(BUILT_IN_HELP_MODULE_NAME) { spec ->
     val productLowerCase = productName.replace(' ', '-').lowercase()
     spec.mainJarName = "$productLowerCase-help.jar"
     spec.directoryName = "${productName.replace(" ", "")}Help"
     spec.excludeFromModule(BUILT_IN_HELP_MODULE_NAME, "com/jetbrains/builtInHelp/indexer/**")
-    spec.doNotCopyModuleLibrariesAutomatically(listOf("jsoup"))
     spec.withGeneratedResources { targetDir, buildContext ->
       val assetJar = targetDir.resolve("lib/help-$productLowerCase-assets.jar")
       buildResourcesForHelpPlugin(
@@ -42,15 +41,18 @@ internal fun buildHelpPlugin(pluginVersion: String, context: BuildContext): Plug
       )
     }
     spec.withPatch { patcher, buildContext ->
-      patcher.patchModuleOutput(moduleName = BUILT_IN_HELP_MODULE_NAME,
-                                path = "META-INF/services/org.apache.lucene.codecs.Codec",
-                                content = "org.apache.lucene.codecs.lucene50.Lucene50Codec")
-      patcher.patchModuleOutput(moduleName = BUILT_IN_HELP_MODULE_NAME,
-                                path = "META-INF/plugin.xml",
-                                content = pluginXml(buildContext, pluginVersion),
-                                overwrite = PatchOverwriteMode.TRUE)
+      patcher.patchModuleOutput(
+        moduleName = BUILT_IN_HELP_MODULE_NAME,
+        path = "META-INF/services/org.apache.lucene.codecs.Codec",
+        content = "org.apache.lucene.codecs.lucene50.Lucene50Codec"
+      )
+      patcher.patchModuleOutput(
+        moduleName = BUILT_IN_HELP_MODULE_NAME,
+        path = "META-INF/plugin.xml",
+        content = pluginXml(buildContext, pluginVersion),
+        overwrite = PatchOverwriteMode.TRUE
+      )
     }
-    LUCENE_LIBRARIES.forEach { spec.withProjectLibrary(it) }
   }
 }