diff --git a/java/ide-resources/resources/META-INF/JavaIdePlugin.xml b/java/ide-resources/resources/META-INF/JavaIdePlugin.xml
index cdcea16737d5..d0f1f7fad5b7 100644
--- a/java/ide-resources/resources/META-INF/JavaIdePlugin.xml
+++ b/java/ide-resources/resources/META-INF/JavaIdePlugin.xml
@@ -29,9 +29,6 @@
   <xi:include href="/META-INF/RegExpPlugin.xml">
     <xi:fallback/>
   </xi:include>
-  <xi:include href="/META-INF/SpellCheckerPlugin.xml">
-    <xi:fallback/>
-  </xi:include>
 
   <xi:include href="/META-INF/structuralsearch.xml">
     <xi:fallback/>
diff --git a/java/plugin/resources/META-INF/plugin.xml b/java/plugin/resources/META-INF/plugin.xml
index 91e609361883..fe61f3ad6798 100644
--- a/java/plugin/resources/META-INF/plugin.xml
+++ b/java/plugin/resources/META-INF/plugin.xml
@@ -16,6 +16,7 @@
     <plugin id="com.intellij.modules.xml"/>
     <plugin id="com.intellij.modules.java-capable"/>
     <module name="intellij.platform.vcs.impl.lang"/>
+    <module name="intellij.spellchecker"/>
     <module name="intellij.xml.dom.impl"/>
   </dependencies>
 
diff --git a/json/backend/resources/intellij.json.backend.xml b/json/backend/resources/intellij.json.backend.xml
index b49d097c78f5..3908a221b33d 100644
--- a/json/backend/resources/intellij.json.backend.xml
+++ b/json/backend/resources/intellij.json.backend.xml
@@ -1,6 +1,7 @@
 <idea-plugin>
   <dependencies>
     <module name="intellij.platform.backend"/>
+    <module name="intellij.spellchecker"/>
     <module name="intellij.json"/>
   </dependencies>
   
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
index 3e7d2e7ebb46..d14ae6a5b89f 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
@@ -82,7 +82,6 @@ private val PLATFORM_IMPLEMENTATION_MODULES = java.util.List.of(
   "intellij.platform.runtime.product",
   "intellij.platform.bootstrap",
 
-  "intellij.spellchecker",
   "intellij.platform.polySymbols",
 
   "intellij.platform.vcs.log",
diff --git a/platform/core-impl/src/com/intellij/ide/plugins/ModulesWithDependencies.kt b/platform/core-impl/src/com/intellij/ide/plugins/ModulesWithDependencies.kt
index 6710243c6024..fa69a04b5fe7 100644
--- a/platform/core-impl/src/com/intellij/ide/plugins/ModulesWithDependencies.kt
+++ b/platform/core-impl/src/com/intellij/ide/plugins/ModulesWithDependencies.kt
@@ -182,6 +182,7 @@ private val contentModulesExtractedInCorePluginWhichCanBeUsedFromExternalPlugins
   "intellij.platform.tasks.impl",
   "intellij.spellchecker.xml",
   "intellij.relaxng",
+  "intellij.spellchecker",
 )
 
 private fun collectDirectDependenciesInOldFormat(rootDescriptor: IdeaPluginDescriptorImpl,
diff --git a/platform/platform-resources/src/META-INF/PlatformLangXmlPlugin.xml b/platform/platform-resources/src/META-INF/PlatformLangXmlPlugin.xml
index 1215bc3733a4..8e3e09ff5b89 100644
--- a/platform/platform-resources/src/META-INF/PlatformLangXmlPlugin.xml
+++ b/platform/platform-resources/src/META-INF/PlatformLangXmlPlugin.xml
@@ -4,9 +4,6 @@
   <xi:include href="/META-INF/RegExpPlugin.xml">
     <xi:fallback/>
   </xi:include>
-  <xi:include href="/META-INF/SpellCheckerPlugin.xml">
-    <xi:fallback/>
-  </xi:include>
   <xi:include href="/META-INF/structuralsearch.xml">
     <xi:fallback/>
   </xi:include>
diff --git a/platform/platform-resources/src/META-INF/common-ide-modules.xml b/platform/platform-resources/src/META-INF/common-ide-modules.xml
index cefea77458db..2c8c91fffcaa 100644
--- a/platform/platform-resources/src/META-INF/common-ide-modules.xml
+++ b/platform/platform-resources/src/META-INF/common-ide-modules.xml
@@ -26,6 +26,7 @@
     <module name="intellij.platform.diagnostic.freezes"/>
     <module name="intellij.platform.warmup"/>
     <module name="intellij.settingsSync.core"/>
+    <module name="intellij.spellchecker"/>
     <module name="intellij.spellchecker.xml"/>
     <module name="intellij.emojipicker"/>
     <module name="intellij.platform.ide.impl.wsl"/>
diff --git a/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/settings/SpellCheckerSettings.kt b/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/settings/SpellCheckerSettings.kt
index 9fc8cbeeb4e1..008da939c47d 100644
--- a/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/settings/SpellCheckerSettings.kt
+++ b/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/settings/SpellCheckerSettings.kt
@@ -6,7 +6,10 @@ import com.intellij.driver.sdk.Project
 
 fun Driver.getSpellCheckerSettingsInstance(project: Project) = utility(SpellCheckerSettings::class).getInstance(project)
 
-@Remote("com.intellij.spellchecker.settings.SpellCheckerSettings")
+@Remote(
+  value = "com.intellij.spellchecker.settings.SpellCheckerSettings",
+  plugin = "com.intellij/intellij.spellchecker",
+)
 interface SpellCheckerSettings {
   fun getInstance(project: Project): SpellCheckerSettings
   fun getDictionaryToSave(): String?
diff --git a/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml b/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml
index b267d2432967..0a64fa91aa98 100644
--- a/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml
+++ b/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml
@@ -2,6 +2,7 @@
   <dependencies>
     <plugin id="com.intellij.properties"/>
     <plugin id="com.intellij.java"/>
+    <module name="intellij.spellchecker"/>
     <module name="intellij.json.backend"/>
     <module name="intellij.properties.backend"/>
     <module name="intellij.properties.backend.psi"/>
diff --git a/plugins/editorconfig/backend/resources/intellij.editorconfig.backend.xml b/plugins/editorconfig/backend/resources/intellij.editorconfig.backend.xml
index 74a49c328789..a11fd056a817 100644
--- a/plugins/editorconfig/backend/resources/intellij.editorconfig.backend.xml
+++ b/plugins/editorconfig/backend/resources/intellij.editorconfig.backend.xml
@@ -2,6 +2,7 @@
 <idea-plugin>
   <dependencies>
     <module name="intellij.platform.backend"/>
+    <module name="intellij.spellchecker"/>
     <module name="intellij.editorconfig.common"/>
   </dependencies>
   <actions resource-bundle="messages.EditorConfigBundle">
diff --git a/plugins/grazie/plugin-content.yaml b/plugins/grazie/plugin-content.yaml
index 412b28b5386e..e45c53828b2c 100644
--- a/plugins/grazie/plugin-content.yaml
+++ b/plugins/grazie/plugin-content.yaml
@@ -3,17 +3,20 @@
   module: intellij.grazie.core
   files:
   - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-detect-jvm/0/nlp-detect-jvm-0.jar
+- name: lib/ai.grazie.spell.gec.engine.local.jar
+  library: ai.grazie.spell.gec.engine.local
+  files:
+  - name: $MAVEN_REPOSITORY$/ai/grazie/spell/gec-spell-engine-local-jvm/0/gec-spell-engine-local-jvm-0.jar
   - name: $MAVEN_REPOSITORY$/ai/grazie/utils/utils-common-jvm/0/utils-common-jvm-0.jar
-  - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-common-jvm/0/nlp-common-jvm-0.jar
+  - name: $MAVEN_REPOSITORY$/ai/grazie/model/model-gec-jvm/0/model-gec-jvm-0.jar
   - name: $MAVEN_REPOSITORY$/ai/grazie/model/model-text-jvm/0/model-text-jvm-0.jar
   - name: $MAVEN_REPOSITORY$/ai/grazie/model/model-common-jvm/0/model-common-jvm-0.jar
-  - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-patterns-jvm/0/nlp-patterns-jvm-0.jar
-  - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-tokenizer-jvm/0/nlp-tokenizer-jvm-0.jar
-  - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-similarity-jvm/0/nlp-similarity-jvm-0.jar
-- name: lib/ai.grazie.nlp.langs.jar
-  library: ai.grazie.nlp.langs
-  files:
   - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-langs-jvm/0/nlp-langs-jvm-0.jar
+  - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-common-jvm/0/nlp-common-jvm-0.jar
+  - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-patterns-jvm/0/nlp-patterns-jvm-0.jar
+  - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-similarity-jvm/0/nlp-similarity-jvm-0.jar
+  - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-phonetics-jvm/0/nlp-phonetics-jvm-0.jar
+  - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-tokenizer-jvm/0/nlp-tokenizer-jvm-0.jar
   reason: <- intellij.grazie.core
 - name: lib/ai.grazie.utils.lucene.lt.compatibility.jar
   library: ai.grazie.utils.lucene.lt.compatibility
@@ -79,6 +82,16 @@
   module: intellij.grazie.core
   files:
   - name: $MAVEN_REPOSITORY$/javax/measure/unit-api/1/unit-api-1.jar
+- name: lib/lucene-analysis-common.jar
+  library: lucene-analysis-common
+  files:
+  - name: $MAVEN_REPOSITORY$/org/apache/lucene/lucene-analysis-common/9/lucene-analysis-common-9.jar
+  reason: <- intellij.grazie.core
+- name: lib/lucene-core.jar
+  library: lucene-core
+  files:
+  - name: $MAVEN_REPOSITORY$/org/apache/lucene/lucene-core/9/lucene-core-9.jar
+  reason: <- intellij.grazie.core
 - name: lib/net.loomchild-segment.jar
   library: net.loomchild:segment:2.0.1
   module: intellij.grazie.core
diff --git a/plugins/grazie/resources/META-INF/plugin.xml b/plugins/grazie/resources/META-INF/plugin.xml
index bcced99e5610..93b16b9d17f6 100644
--- a/plugins/grazie/resources/META-INF/plugin.xml
+++ b/plugins/grazie/resources/META-INF/plugin.xml
@@ -23,6 +23,7 @@
   ]]></description>
 
   <dependencies>
+    <module name="intellij.spellchecker"/>
     <module name="intellij.platform.vcs.impl"/>
   </dependencies>
 
diff --git a/plugins/groovy/resources/META-INF/plugin.xml b/plugins/groovy/resources/META-INF/plugin.xml
index 1c7a67a1645b..0b6c339e88d5 100644
--- a/plugins/groovy/resources/META-INF/plugin.xml
+++ b/plugins/groovy/resources/META-INF/plugin.xml
@@ -21,6 +21,7 @@
   <dependencies>
     <plugin id="com.intellij.properties"/>
     <plugin id="com.intellij.java"/>
+    <module name="intellij.spellchecker"/>
     <module name="intellij.java.unscramble"/>
     <module name="intellij.properties.backend"/>
     <module name="intellij.properties.backend.psi"/>
diff --git a/plugins/javaFX/resources/intellij.javaFX.xml b/plugins/javaFX/resources/intellij.javaFX.xml
index edc09653b4c2..68c7529f6a66 100644
--- a/plugins/javaFX/resources/intellij.javaFX.xml
+++ b/plugins/javaFX/resources/intellij.javaFX.xml
@@ -1,5 +1,6 @@
 <idea-plugin>
   <dependencies>
+    <module name="intellij.spellchecker"/>
     <plugin id="com.intellij.java"/>
   </dependencies>
 
diff --git a/plugins/jsonpath/resources/META-INF/plugin.xml b/plugins/jsonpath/resources/META-INF/plugin.xml
index f97bc2eb8801..e593030b3bce 100644
--- a/plugins/jsonpath/resources/META-INF/plugin.xml
+++ b/plugins/jsonpath/resources/META-INF/plugin.xml
@@ -10,6 +10,7 @@
 
   <dependencies>
     <module name="intellij.json.backend"/>
+    <module name="intellij.spellchecker"/>
   </dependencies>
 
   <resource-bundle>messages.JsonPathBundle</resource-bundle>
diff --git a/plugins/markdown/spellchecker/src/main/resources/intellij.markdown.spellchecker.xml b/plugins/markdown/spellchecker/src/main/resources/intellij.markdown.spellchecker.xml
index 6f2fd57173cc..25870c0371dd 100644
--- a/plugins/markdown/spellchecker/src/main/resources/intellij.markdown.spellchecker.xml
+++ b/plugins/markdown/spellchecker/src/main/resources/intellij.markdown.spellchecker.xml
@@ -1,6 +1,7 @@
 <idea-plugin package="org.intellij.plugins.markdown.spellchecker">
   <dependencies>
     <plugin id="com.intellij.modules.lang"/>
+    <module name="intellij.spellchecker"/>
   </dependencies>
   <extensions defaultExtensionNs="com.intellij">
     <spellchecker.support language="Markdown"
diff --git a/plugins/properties/resources/intellij.properties.backend.xml b/plugins/properties/resources/intellij.properties.backend.xml
index 433fc3235d10..e5a4834992db 100644
--- a/plugins/properties/resources/intellij.properties.backend.xml
+++ b/plugins/properties/resources/intellij.properties.backend.xml
@@ -7,6 +7,7 @@
     <module name="intellij.properties"/>
     <module name="intellij.properties.psi"/>
     <module name="intellij.properties.backend.psi"/>
+    <module name="intellij.spellchecker"/>
   </dependencies>
 
   <extensionPoints>
diff --git a/plugins/search-everywhere-ml/plugin-content.yaml b/plugins/search-everywhere-ml/plugin-content.yaml
index ffc8219702bd..fb9a1f5562fe 100644
--- a/plugins/search-everywhere-ml/plugin-content.yaml
+++ b/plugins/search-everywhere-ml/plugin-content.yaml
@@ -29,9 +29,20 @@
 - name: lib/modules/intellij.searchEverywhereMl.typos.jar
   contentModules:
   - name: intellij.searchEverywhereMl.typos
-    libraries:
-      ai.grazie.spell.gec.engine.local.jvm:
-      - name: $MAVEN_REPOSITORY$/ai/grazie/spell/gec-spell-engine-local-jvm/0/gec-spell-engine-local-jvm-0.jar
+  library: ai.grazie.spell.gec.engine.local
+  files:
+  - name: $MAVEN_REPOSITORY$/ai/grazie/spell/gec-spell-engine-local-jvm/0/gec-spell-engine-local-jvm-0.jar
+  - name: $MAVEN_REPOSITORY$/ai/grazie/utils/utils-common-jvm/0/utils-common-jvm-0.jar
+  - name: $MAVEN_REPOSITORY$/ai/grazie/model/model-gec-jvm/0/model-gec-jvm-0.jar
+  - name: $MAVEN_REPOSITORY$/ai/grazie/model/model-text-jvm/0/model-text-jvm-0.jar
+  - name: $MAVEN_REPOSITORY$/ai/grazie/model/model-common-jvm/0/model-common-jvm-0.jar
+  - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-langs-jvm/0/nlp-langs-jvm-0.jar
+  - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-common-jvm/0/nlp-common-jvm-0.jar
+  - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-patterns-jvm/0/nlp-patterns-jvm-0.jar
+  - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-similarity-jvm/0/nlp-similarity-jvm-0.jar
+  - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-phonetics-jvm/0/nlp-phonetics-jvm-0.jar
+  - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-tokenizer-jvm/0/nlp-tokenizer-jvm-0.jar
+  reason: <- intellij.searchEverywhereMl.typos
 - name: lib/searchEverywhereMl.jar
   modules:
   - name: intellij.searchEverywhereMl
diff --git a/plugins/sh/resources/META-INF/plugin.xml b/plugins/sh/resources/META-INF/plugin.xml
index b2624da14837..eb5d71cd8f44 100644
--- a/plugins/sh/resources/META-INF/plugin.xml
+++ b/plugins/sh/resources/META-INF/plugin.xml
@@ -13,6 +13,7 @@
 
   <dependencies>
     <plugin id="com.intellij.modules.lang"/>
+    <module name="intellij.spellchecker"/>
   </dependencies>
 
   <description><![CDATA[
diff --git a/plugins/textmate/resources/META-INF/plugin.xml b/plugins/textmate/resources/META-INF/plugin.xml
index 6531b33c6a4f..c3d673f458a6 100644
--- a/plugins/textmate/resources/META-INF/plugin.xml
+++ b/plugins/textmate/resources/META-INF/plugin.xml
@@ -10,6 +10,7 @@
   ]]></description>
 
   <depends>com.intellij.modules.lang</depends>
+  <depends>com.intellij.modules.spellchecker</depends>
 
   <extensionPoints>
     <extensionPoint qualifiedName="com.intellij.textmate.bundleProvider"
diff --git a/plugins/ui-designer/resources/META-INF/plugin.xml b/plugins/ui-designer/resources/META-INF/plugin.xml
index be48cc90d4d4..21b763f58d2d 100644
--- a/plugins/ui-designer/resources/META-INF/plugin.xml
+++ b/plugins/ui-designer/resources/META-INF/plugin.xml
@@ -6,6 +6,7 @@
   <description>Allows to design Swing UI graphically, supports code generation/instrumentation, preview, widgets library and UI-related code inspections</description>
   <resource-bundle>messages.UIDesignerBundle</resource-bundle>
   <depends>com.intellij.java-i18n</depends>
+  <depends>com.intellij.modules.spellchecker</depends>
   <depends>com.intellij.properties</depends>
 
   <extensionPoints>
diff --git a/plugins/yaml/backend/resources/intellij.yaml.backend.xml b/plugins/yaml/backend/resources/intellij.yaml.backend.xml
index 52fd2a47ddfc..4614cdc29200 100644
--- a/plugins/yaml/backend/resources/intellij.yaml.backend.xml
+++ b/plugins/yaml/backend/resources/intellij.yaml.backend.xml
@@ -5,6 +5,7 @@
     <module name="intellij.platform.backend"/>
     <module name="intellij.platform.searchEverywhere.backend"/>
     <module name="intellij.yaml"/>
+    <module name="intellij.spellchecker"/>
   </dependencies>
   
   <extensions defaultExtensionNs="com.intellij">
diff --git a/python/pluginResources/intellij.python.community.impl.xml b/python/pluginResources/intellij.python.community.impl.xml
index 69593301a731..7a05c8259745 100644
--- a/python/pluginResources/intellij.python.community.impl.xml
+++ b/python/pluginResources/intellij.python.community.impl.xml
@@ -1,5 +1,6 @@
 <idea-plugin>
   <dependencies>
+    <module name="intellij.spellchecker"/>
     <module name="intellij.python.sdk"/>
     <module name="intellij.python.community"/>
   </dependencies>
diff --git a/spellchecker/resources/META-INF/SpellCheckerPlugin.xml b/spellchecker/resources/intellij.spellchecker.xml
similarity index 98%
rename from spellchecker/resources/META-INF/SpellCheckerPlugin.xml
rename to spellchecker/resources/intellij.spellchecker.xml
index f4af69d183d9..b50590c8bd95 100644
--- a/spellchecker/resources/META-INF/SpellCheckerPlugin.xml
+++ b/spellchecker/resources/intellij.spellchecker.xml
@@ -1,4 +1,5 @@
 <idea-plugin>
+  <module value="com.intellij.modules.spellchecker"/>
   <extensionPoints>
     <extensionPoint name="spellchecker.support" beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
       <with attribute="implementationClass" implements="com.intellij.spellchecker.tokenizer.SpellcheckingStrategy"/>
diff --git a/spellchecker/xml/resources/intellij.spellchecker.xml.xml b/spellchecker/xml/resources/intellij.spellchecker.xml.xml
index 21148d6244bf..65acccae1d06 100644
--- a/spellchecker/xml/resources/intellij.spellchecker.xml.xml
+++ b/spellchecker/xml/resources/intellij.spellchecker.xml.xml
@@ -1,6 +1,7 @@
 <idea-plugin>
   <dependencies>
     <plugin id="com.intellij.modules.xml"/>
+    <module name="intellij.spellchecker"/>
   </dependencies>
   <extensions defaultExtensionNs="com.intellij">
     <spellchecker.support language="HTML" implementationClass="com.intellij.spellchecker.xml.HtmlSpellcheckingStrategy"/>