diff --git a/.idea/modules.xml b/.idea/modules.xml
index 8720385396a2..d943f90d0368 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -56,6 +56,7 @@
       <module fileurl="file://$PROJECT_DIR$/java/compiler/instrumentation-util/instrumentation-util.iml" filepath="$PROJECT_DIR$/java/compiler/instrumentation-util/instrumentation-util.iml" group="java/compiler" />
       <module fileurl="file://$PROJECT_DIR$/plugins/java-i18n/java-i18n.iml" filepath="$PROJECT_DIR$/plugins/java-i18n/java-i18n.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/java/java-impl/java-impl.iml" filepath="$PROJECT_DIR$/java/java-impl/java-impl.iml" group="java" />
+      <module fileurl="file://$PROJECT_DIR$/java/java-indexing-api/java-indexing-api.iml" filepath="$PROJECT_DIR$/java/java-indexing-api/java-indexing-api.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/java-indexing-impl/java-indexing-impl.iml" filepath="$PROJECT_DIR$/java/java-indexing-impl/java-indexing-impl.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/java-psi-api/java-psi-api.iml" filepath="$PROJECT_DIR$/java/java-psi-api/java-psi-api.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/java-psi-impl/java-psi-impl.iml" filepath="$PROJECT_DIR$/java/java-psi-impl/java-psi-impl.iml" group="java" />
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index cba7816b15ef..55c5cf77e6a6 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -49,7 +49,7 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
 
   //noinspection GroovyAssignabilityCheck
   List<String> openapiModules = [platformApiModules,
-          "java-psi-api", "openapi", "testFramework-java", "debugger-openapi", "compiler-openapi", "dom-openapi", "execution-openapi",
+          "java-psi-api", "java-indexing-api", "openapi", "testFramework-java", "debugger-openapi", "compiler-openapi", "dom-openapi", "execution-openapi",
           "jsp-openapi", "jsp-base-openapi"].flatten()
 
   //noinspection GroovyAssignabilityCheck
@@ -531,6 +531,7 @@ def layout_core_upsource(String home, String target) {
       module("java-psi-impl")
       module("projectModel-api")
       module("projectModel-impl")
+      module("java-indexing-api")
       module("java-indexing-impl")
       module("platform-resources")
       module("platform-resources-en")
diff --git a/java/java-indexing-api/java-indexing-api.iml b/java/java-indexing-api/java-indexing-api.iml
new file mode 100644
index 000000000000..d5c074327501
--- /dev/null
+++ b/java/java-indexing-api/java-indexing-api.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+