diff --git a/idea/idea-git/build.gradle.kts b/idea/idea-git/build.gradle.kts
new file mode 100644
index 00000000000..e32ca90f703
--- /dev/null
+++ b/idea/idea-git/build.gradle.kts
@@ -0,0 +1,18 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    compileOnly(project(":idea"))
+
+    compileOnly(intellijDep())
+    compileOnly(intellijPluginDep("git4idea"))
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {  }
+}
+
+ideaPlugin()
diff --git a/idea/src/META-INF/git4idea.xml b/idea/src/META-INF/git4idea.xml
new file mode 100644
index 00000000000..1bb24d148a3
--- /dev/null
+++ b/idea/src/META-INF/git4idea.xml
@@ -0,0 +1,4 @@
+<idea-plugin>
+    <extensions defaultExtensionNs="Git4Idea">
+    </extensions>
+</idea-plugin>
\ No newline at end of file
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 54a0964ae02..40c71df3a7c 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -29,6 +29,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <depends optional="true" config-file="coverage.xml">Coverage</depends>
   <depends optional="true" config-file="i18n.xml">com.intellij.java-i18n</depends>
   <depends optional="true" config-file="decompiler.xml">org.jetbrains.java.decompiler</depends>
+  <depends optional="true" config-file="git4idea.xml">Git4Idea</depends>
 
   <!-- ULTIMATE-PLUGIN-PLACEHOLDER -->
 
diff --git a/idea/src/META-INF/plugin.xml.172 b/idea/src/META-INF/plugin.xml.172
index 8676743050b..e2f5c269738 100644
--- a/idea/src/META-INF/plugin.xml.172
+++ b/idea/src/META-INF/plugin.xml.172
@@ -31,6 +31,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <depends optional="true" config-file="i18n.xml">com.intellij.java-i18n</depends>
   <depends optional="true" config-file="injection.xml">org.intellij.intelliLang</depends>
   <depends optional="true" config-file="decompiler.xml">org.jetbrains.java.decompiler</depends>
+  <depends optional="true" config-file="git4idea.xml">Git4Idea</depends>
 
   <!-- ULTIMATE-PLUGIN-PLACEHOLDER -->
 
diff --git a/idea/src/META-INF/plugin.xml.173 b/idea/src/META-INF/plugin.xml.173
index 02a129f7709..73ebb270636 100644
--- a/idea/src/META-INF/plugin.xml.173
+++ b/idea/src/META-INF/plugin.xml.173
@@ -31,6 +31,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <depends optional="true" config-file="i18n.xml">com.intellij.java-i18n</depends>
   <depends optional="true" config-file="injection.xml">org.intellij.intelliLang</depends>
   <depends optional="true" config-file="decompiler.xml">org.jetbrains.java.decompiler</depends>
+  <depends optional="true" config-file="git4idea.xml">Git4Idea</depends>
 
   <!-- ULTIMATE-PLUGIN-PLACEHOLDER -->
 
diff --git a/idea/src/META-INF/plugin.xml.182 b/idea/src/META-INF/plugin.xml.182
index 1bb56fbff90..2c7a9a49640 100644
--- a/idea/src/META-INF/plugin.xml.182
+++ b/idea/src/META-INF/plugin.xml.182
@@ -29,6 +29,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <depends optional="true" config-file="coverage.xml">Coverage</depends>
   <depends optional="true" config-file="i18n.xml">com.intellij.java-i18n</depends>
   <depends optional="true" config-file="decompiler.xml">org.jetbrains.java.decompiler</depends>
+  <depends optional="true" config-file="git4idea.xml">Git4Idea</depends>
 
   <!-- ULTIMATE-PLUGIN-PLACEHOLDER -->
 
diff --git a/idea/src/META-INF/plugin.xml.as31 b/idea/src/META-INF/plugin.xml.as31
index 65be4b11b06..6bb35548384 100644
--- a/idea/src/META-INF/plugin.xml.as31
+++ b/idea/src/META-INF/plugin.xml.as31
@@ -31,6 +31,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <depends optional="true" config-file="i18n.xml">com.intellij.java-i18n</depends>
   <depends optional="true" config-file="injection.xml">org.intellij.intelliLang</depends>
   <depends optional="true" config-file="decompiler.xml">org.jetbrains.java.decompiler</depends>
+  <depends optional="true" config-file="git4idea.xml">Git4Idea</depends>
 
   <!-- ULTIMATE-PLUGIN-PLACEHOLDER -->
 
diff --git a/idea/src/META-INF/plugin.xml.as32 b/idea/src/META-INF/plugin.xml.as32
index 32ddb70f1ee..74908fdae94 100644
--- a/idea/src/META-INF/plugin.xml.as32
+++ b/idea/src/META-INF/plugin.xml.as32
@@ -31,6 +31,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <depends optional="true" config-file="i18n.xml">com.intellij.java-i18n</depends>
   <depends optional="true" config-file="injection.xml">org.intellij.intelliLang</depends>
   <depends optional="true" config-file="decompiler.xml">org.jetbrains.java.decompiler</depends>
+  <depends optional="true" config-file="git4idea.xml">Git4Idea</depends>
 
   <!-- ULTIMATE-PLUGIN-PLACEHOLDER -->
 
diff --git a/settings.gradle b/settings.gradle
index 83e7500f6a5..13d2de8123c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -64,6 +64,7 @@ include ":kotlin-build-common",
         ":idea:idea-jvm",
         ":idea:idea-maven",
         ":idea:idea-gradle",
+        ":idea:idea-git",
         ":idea:idea-jps-common",
         ":idea:formatter",
         ":idea:ide-common",