diff --git a/fleet/andel/module-content.yaml b/fleet/andel/module-content.yaml
new file mode 100644
index 000000000000..9fbca893d728
--- /dev/null
+++ b/fleet/andel/module-content.yaml
@@ -0,0 +1,3 @@
+- name: dist.all/lib/fleet.andel.jar
+  modules:
+  - name: fleet.andel
\ No newline at end of file
diff --git a/fleet/bifurcan/module-content.yaml b/fleet/bifurcan/module-content.yaml
new file mode 100644
index 000000000000..f1d7413fd81e
--- /dev/null
+++ b/fleet/bifurcan/module-content.yaml
@@ -0,0 +1,3 @@
+- name: dist.all/lib/fleet.bifurcan.jar
+  modules:
+  - name: fleet.bifurcan
\ No newline at end of file
diff --git a/fleet/fastutil/module-content.yaml b/fleet/fastutil/module-content.yaml
new file mode 100644
index 000000000000..f5a75f125060
--- /dev/null
+++ b/fleet/fastutil/module-content.yaml
@@ -0,0 +1,3 @@
+- name: dist.all/lib/fleet.fastutil.jar
+  modules:
+  - name: fleet.fastutil
\ No newline at end of file
diff --git a/fleet/kernel/module-content.yaml b/fleet/kernel/module-content.yaml
new file mode 100644
index 000000000000..7ab3a274a91d
--- /dev/null
+++ b/fleet/kernel/module-content.yaml
@@ -0,0 +1,3 @@
+- name: dist.all/lib/fleet.kernel.jar
+  modules:
+  - name: fleet.kernel
\ No newline at end of file
diff --git a/fleet/multiplatform.shims/module-content.yaml b/fleet/multiplatform.shims/module-content.yaml
new file mode 100644
index 000000000000..2b2bcaa465da
--- /dev/null
+++ b/fleet/multiplatform.shims/module-content.yaml
@@ -0,0 +1,3 @@
+- name: dist.all/lib/fleet.multiplatform.shims.jar
+  modules:
+  - name: fleet.multiplatform.shims
\ No newline at end of file
diff --git a/fleet/reporting/api/module-content.yaml b/fleet/reporting/api/module-content.yaml
new file mode 100644
index 000000000000..66e2cd7359ba
--- /dev/null
+++ b/fleet/reporting/api/module-content.yaml
@@ -0,0 +1,3 @@
+- name: dist.all/lib/fleet.reporting.api.jar
+  modules:
+  - name: fleet.reporting.api
\ No newline at end of file
diff --git a/fleet/reporting/shared/module-content.yaml b/fleet/reporting/shared/module-content.yaml
new file mode 100644
index 000000000000..06f9023ef05e
--- /dev/null
+++ b/fleet/reporting/shared/module-content.yaml
@@ -0,0 +1,3 @@
+- name: dist.all/lib/fleet.reporting.shared.jar
+  modules:
+  - name: fleet.reporting.shared
\ No newline at end of file
diff --git a/fleet/rhizomedb/module-content.yaml b/fleet/rhizomedb/module-content.yaml
new file mode 100644
index 000000000000..f6e77d40ab71
--- /dev/null
+++ b/fleet/rhizomedb/module-content.yaml
@@ -0,0 +1,3 @@
+- name: dist.all/lib/fleet.rhizomedb.jar
+  modules:
+  - name: fleet.rhizomedb
\ No newline at end of file
diff --git a/fleet/rpc/module-content.yaml b/fleet/rpc/module-content.yaml
new file mode 100644
index 000000000000..adc4c79055ef
--- /dev/null
+++ b/fleet/rpc/module-content.yaml
@@ -0,0 +1,3 @@
+- name: dist.all/lib/fleet.rpc.jar
+  modules:
+  - name: fleet.rpc
\ No newline at end of file
diff --git a/fleet/util/codepoints/module-content.yaml b/fleet/util/codepoints/module-content.yaml
new file mode 100644
index 000000000000..d87532ab08ab
--- /dev/null
+++ b/fleet/util/codepoints/module-content.yaml
@@ -0,0 +1,6 @@
+- name: dist.all/lib/fleet.util.codepoints.jar
+  modules:
+  - name: fleet.util.codepoints
+  library: de.cketti.unicode.kotlin.codepoints.jvm
+  files:
+  - name: $MAVEN_REPOSITORY$/de/cketti/unicode/kotlin-codepoints-jvm/0/kotlin-codepoints-jvm-0.jar
\ No newline at end of file
diff --git a/fleet/util/core/module-content.yaml b/fleet/util/core/module-content.yaml
new file mode 100644
index 000000000000..a7f5125086d8
--- /dev/null
+++ b/fleet/util/core/module-content.yaml
@@ -0,0 +1,3 @@
+- name: dist.all/lib/fleet.util.core.jar
+  modules:
+  - name: fleet.util.core
\ No newline at end of file
diff --git a/fleet/util/logging/api/module-content.yaml b/fleet/util/logging/api/module-content.yaml
new file mode 100644
index 000000000000..4f4d08200ee7
--- /dev/null
+++ b/fleet/util/logging/api/module-content.yaml
@@ -0,0 +1,3 @@
+- name: dist.all/lib/fleet.util.logging.api.jar
+  modules:
+  - name: fleet.util.logging.api
\ No newline at end of file
diff --git a/fleet/util/serialization/module-content.yaml b/fleet/util/serialization/module-content.yaml
new file mode 100644
index 000000000000..1e9931d5b977
--- /dev/null
+++ b/fleet/util/serialization/module-content.yaml
@@ -0,0 +1,3 @@
+- name: dist.all/lib/fleet.util.serialization.jar
+  modules:
+  - name: fleet.util.serialization
\ No newline at end of file
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformJarNames.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformJarNames.kt
index 1d51fdcd81bc..4dc86fcb92ae 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformJarNames.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformJarNames.kt
@@ -24,15 +24,9 @@ object PlatformJarNames {
    */
   internal fun getPlatformModuleJarName(moduleName: String, frontendModuleFilter: FrontendModuleFilter): String {
     if (frontendModuleFilter.isBackendModule(moduleName)) {
-      if (moduleName.startsWith("fleet.")) {
-        return LIB_BACKEND_JAR
-      }
       return APP_BACKEND_JAR
     }
     else {
-      if (moduleName.startsWith("fleet.")) {
-        return LIB_JAR
-      }
       return APP_JAR
     }
   }
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt
index 40fb79a4941a..534395245950 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt
@@ -39,6 +39,8 @@ object CommunityModuleSets : ModuleSetProvider {
   fun essential(): ModuleSet = moduleSet("essential") {
     // Include libraries first (they are xi:included in essential.xml)
     moduleSet(libraries())
+    // Fleet libraries are used by core functionality like Project, so should be essential
+    moduleSet(fleet())
 
     // Core essential modules
     module("intellij.platform.settings.local")
@@ -390,6 +392,27 @@ object CommunityModuleSets : ModuleSetProvider {
     module("intellij.rd.ui")
   }
 
+  /**
+   * Fleet libraries used in IntelliJ Platform. They are built from sources and put in the distribution.
+   * Corresponds to intellij.moduleSets.fleet.xml
+   */
+  fun fleet(): ModuleSet = moduleSet("libraries.fleet") {
+    // These modules are embedded because some of them are used by V1 platform modules
+    embeddedModule("fleet.andel")
+    embeddedModule("fleet.bifurcan")
+    embeddedModule("fleet.fastutil")
+    embeddedModule("fleet.kernel")
+    embeddedModule("fleet.multiplatform.shims")
+    embeddedModule("fleet.reporting.api")
+    embeddedModule("fleet.reporting.shared")
+    embeddedModule("fleet.rhizomedb")
+    embeddedModule("fleet.rpc")
+    embeddedModule("fleet.util.codepoints")
+    embeddedModule("fleet.util.core")
+    embeddedModule("fleet.util.logging.api")
+    embeddedModule("fleet.util.serialization")
+  }
+
   /**
    * IDE common modules (includes essential, compose, grid.core, vcs, xml, duplicates).
    */
diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.xml
index ef92e1e983e5..e6d7b2e7c175 100644
--- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.xml
+++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.xml
@@ -103,6 +103,22 @@
 
     <!-- </editor-fold> -->
 
+    <!-- <editor-fold desc="nested: libraries.fleet"> -->
+    <module name="fleet.andel" loading="embedded"/>
+    <module name="fleet.bifurcan" loading="embedded"/>
+    <module name="fleet.fastutil" loading="embedded"/>
+    <module name="fleet.kernel" loading="embedded"/>
+    <module name="fleet.multiplatform.shims" loading="embedded"/>
+    <module name="fleet.reporting.api" loading="embedded"/>
+    <module name="fleet.reporting.shared" loading="embedded"/>
+    <module name="fleet.rhizomedb" loading="embedded"/>
+    <module name="fleet.rpc" loading="embedded"/>
+    <module name="fleet.util.codepoints" loading="embedded"/>
+    <module name="fleet.util.core" loading="embedded"/>
+    <module name="fleet.util.logging.api" loading="embedded"/>
+    <module name="fleet.util.serialization" loading="embedded"/>
+    <!-- </editor-fold> -->
+
     <!-- <editor-fold desc="direct modules"> -->
     <module name="intellij.platform.settings.local"/>
     <module name="intellij.platform.backend"/>
diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml
index 002507069223..f44c791472d6 100644
--- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml
+++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml
@@ -106,6 +106,22 @@
 
     <!-- </editor-fold> -->
 
+    <!-- <editor-fold desc="nested: essential > libraries.fleet"> -->
+    <module name="fleet.andel" loading="embedded"/>
+    <module name="fleet.bifurcan" loading="embedded"/>
+    <module name="fleet.fastutil" loading="embedded"/>
+    <module name="fleet.kernel" loading="embedded"/>
+    <module name="fleet.multiplatform.shims" loading="embedded"/>
+    <module name="fleet.reporting.api" loading="embedded"/>
+    <module name="fleet.reporting.shared" loading="embedded"/>
+    <module name="fleet.rhizomedb" loading="embedded"/>
+    <module name="fleet.rpc" loading="embedded"/>
+    <module name="fleet.util.codepoints" loading="embedded"/>
+    <module name="fleet.util.core" loading="embedded"/>
+    <module name="fleet.util.logging.api" loading="embedded"/>
+    <module name="fleet.util.serialization" loading="embedded"/>
+    <!-- </editor-fold> -->
+
     <!-- <editor-fold desc="direct modules"> -->
     <module name="intellij.platform.settings.local"/>
     <module name="intellij.platform.backend"/>
diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.fleet.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.fleet.xml
new file mode 100644
index 000000000000..0805affbe543
--- /dev/null
+++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.fleet.xml
@@ -0,0 +1,21 @@
+<!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
+<!-- To regenerate, run: CommunityModuleSets.main() -->
+<!-- Source: see moduleSet("libraries.fleet") function in CommunityModuleSets.kt -->
+<!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
+<idea-plugin>
+  <content namespace="jetbrains">
+    <module name="fleet.andel" loading="embedded"/>
+    <module name="fleet.bifurcan" loading="embedded"/>
+    <module name="fleet.fastutil" loading="embedded"/>
+    <module name="fleet.kernel" loading="embedded"/>
+    <module name="fleet.multiplatform.shims" loading="embedded"/>
+    <module name="fleet.reporting.api" loading="embedded"/>
+    <module name="fleet.reporting.shared" loading="embedded"/>
+    <module name="fleet.rhizomedb" loading="embedded"/>
+    <module name="fleet.rpc" loading="embedded"/>
+    <module name="fleet.util.codepoints" loading="embedded"/>
+    <module name="fleet.util.core" loading="embedded"/>
+    <module name="fleet.util.logging.api" loading="embedded"/>
+    <module name="fleet.util.serialization" loading="embedded"/>
+  </content>
+</idea-plugin>
\ No newline at end of file