diff --git a/.idea/modules.xml b/.idea/modules.xml
index cb4a78f94746..45907371f0c3 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -466,6 +466,8 @@
       <module fileurl="file://$PROJECT_DIR$/java/java-runtime/intellij.java.rt.iml" filepath="$PROJECT_DIR$/java/java-runtime/intellij.java.rt.iml" />
       <module fileurl="file://$PROJECT_DIR$/java/structuralsearch-java/intellij.java.structuralSearch.iml" filepath="$PROJECT_DIR$/java/structuralsearch-java/intellij.java.structuralSearch.iml" />
       <module fileurl="file://$PROJECT_DIR$/java/java-structure-view/intellij.java.structureView.iml" filepath="$PROJECT_DIR$/java/java-structure-view/intellij.java.structureView.iml" />
+      <module fileurl="file://$PROJECT_DIR$/java/java-terminal/intellij.java.terminal.iml" filepath="$PROJECT_DIR$/java/java-terminal/intellij.java.terminal.iml" />
+      <module fileurl="file://$PROJECT_DIR$/java/java-terminal/intellij.java.terminal.tests.iml" filepath="$PROJECT_DIR$/java/java-terminal/intellij.java.terminal.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/java/testFramework/intellij.java.testFramework.iml" filepath="$PROJECT_DIR$/java/testFramework/intellij.java.testFramework.iml" />
       <module fileurl="file://$PROJECT_DIR$/java/java-tests/intellij.java.tests.iml" filepath="$PROJECT_DIR$/java/java-tests/intellij.java.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/java/typeMigration/intellij.java.typeMigration.iml" filepath="$PROJECT_DIR$/java/typeMigration/intellij.java.typeMigration.iml" />
diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml
index 03b8577a5ab4..8924e68a4297 100644
--- a/intellij.idea.community.main.iml
+++ b/intellij.idea.community.main.iml
@@ -224,5 +224,7 @@
     <orderEntry type="module" module-name="intellij.java.compiler.charts" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.compose" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.json.split" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.java.terminal.tests" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.java.terminal" scope="RUNTIME" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/java-terminal/intellij.java.terminal.iml b/java/java-terminal/intellij.java.terminal.iml
new file mode 100644
index 000000000000..18ec07d2b627
--- /dev/null
+++ b/java/java-terminal/intellij.java.terminal.iml
@@ -0,0 +1,15 @@
+<?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$/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.terminal" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/java/java-terminal/intellij.java.terminal.tests.iml b/java/java-terminal/intellij.java.terminal.tests.iml
new file mode 100644
index 000000000000..2cf1868b603b
--- /dev/null
+++ b/java/java-terminal/intellij.java.terminal.tests.iml
@@ -0,0 +1,15 @@
+<?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$/test">
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.terminal" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.tests" scope="TEST" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/java/java-terminal/resources/intellij.java.terminal.xml b/java/java-terminal/resources/intellij.java.terminal.xml
new file mode 100644
index 000000000000..17cfa214c779
--- /dev/null
+++ b/java/java-terminal/resources/intellij.java.terminal.xml
@@ -0,0 +1,9 @@
+<idea-plugin package="com.intellij.java.terminal">
+  <module value="intellij.java.terminal" />
+  <dependencies>
+    <plugin id="org.jetbrains.plugins.terminal"/>
+  </dependencies>
+  <extensions defaultExtensionNs="org.jetbrains.plugins.terminal">
+    <commandSpecsProvider implementation="com.intellij.java.terminal.JavaShellCommandSpecsProvider"/>
+  </extensions>
+</idea-plugin>
diff --git a/java/java-terminal/resources/messages/JavaTerminalBundle.properties b/java/java-terminal/resources/messages/JavaTerminalBundle.properties
new file mode 100644
index 000000000000..ef72b40b0547
--- /dev/null
+++ b/java/java-terminal/resources/messages/JavaTerminalBundle.properties
@@ -0,0 +1,2 @@
+java.command.terminal.description=Runs java
+java.command.terminal.help.option.description=Prints help message
\ No newline at end of file
diff --git a/java/java-terminal/src/com/intellij/java/terminal/JavaShellCommandSpecsProvider.kt b/java/java-terminal/src/com/intellij/java/terminal/JavaShellCommandSpecsProvider.kt
new file mode 100644
index 000000000000..c2fbda6a3015
--- /dev/null
+++ b/java/java-terminal/src/com/intellij/java/terminal/JavaShellCommandSpecsProvider.kt
@@ -0,0 +1,21 @@
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.java.terminal
+
+import com.intellij.terminal.completion.spec.ShellCommandSpec
+import org.jetbrains.plugins.terminal.block.completion.spec.ShellCommandSpec
+import org.jetbrains.plugins.terminal.block.completion.spec.ShellCommandSpecConflictStrategy
+import org.jetbrains.plugins.terminal.block.completion.spec.ShellCommandSpecInfo
+import org.jetbrains.plugins.terminal.block.completion.spec.ShellCommandSpecsProvider
+
+class JavaShellCommandSpecsProvider : ShellCommandSpecsProvider {
+  override fun getCommandSpecs(): List<ShellCommandSpecInfo> {
+    return listOf(ShellCommandSpecInfo.create(getSpecs(), ShellCommandSpecConflictStrategy.REPLACE))
+  }
+}
+
+private fun getSpecs() : ShellCommandSpec = ShellCommandSpec("java") {
+  description(JavaTerminalBundle.message("java.command.terminal.description"))
+  option("--help", "-help", "-h") {
+    description(JavaTerminalBundle.message("java.command.terminal.help.option.description"))
+  }
+}
\ No newline at end of file
diff --git a/java/java-terminal/src/com/intellij/java/terminal/JavaTerminalBundle.kt b/java/java-terminal/src/com/intellij/java/terminal/JavaTerminalBundle.kt
new file mode 100644
index 000000000000..58bcf2ea8821
--- /dev/null
+++ b/java/java-terminal/src/com/intellij/java/terminal/JavaTerminalBundle.kt
@@ -0,0 +1,23 @@
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.java.terminal
+
+import com.intellij.DynamicBundle
+import org.jetbrains.annotations.Nls
+import org.jetbrains.annotations.PropertyKey
+import java.util.function.Supplier
+
+private const val BUNDLE: String = "messages.JavaTerminalBundle"
+
+object JavaTerminalBundle {
+  private val INSTANCE = DynamicBundle(JavaTerminalBundle::class.java, BUNDLE)
+
+  @JvmStatic
+  fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): @Nls String {
+    return INSTANCE.getMessage(key = key, params = params)
+  }
+
+  @JvmStatic
+  fun messagePointer(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): Supplier<@Nls String> {
+    return INSTANCE.getLazyMessage(key = key, params = params)
+  }
+}
\ No newline at end of file
diff --git a/java/java-terminal/test/com/intellij/java/terminal/completion/JavaCommandCompletionTest.kt b/java/java-terminal/test/com/intellij/java/terminal/completion/JavaCommandCompletionTest.kt
new file mode 100644
index 000000000000..437073e809a8
--- /dev/null
+++ b/java/java-terminal/test/com/intellij/java/terminal/completion/JavaCommandCompletionTest.kt
@@ -0,0 +1,20 @@
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.java.terminal.completion
+
+import com.intellij.terminal.completion.spec.ShellCompletionSuggestion
+import com.intellij.testFramework.fixtures.BasePlatformTestCase
+import kotlinx.coroutines.runBlocking
+import org.jetbrains.plugins.terminal.block.util.ShellCompletionTestFixture
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@RunWith(JUnit4::class)
+class JavaCommandCompletionTest : BasePlatformTestCase() {
+  @Test
+  fun runCustomTest() = runBlocking {
+    val fixture = ShellCompletionTestFixture.builder(project).build()
+    val actual: List<ShellCompletionSuggestion> = fixture.getCompletions("java ")
+    assertSameElements(actual.map { it.name }, listOf("--help", "-help", "-h"))
+  }
+}
\ No newline at end of file
diff --git a/java/plugin/plugin-content.yaml b/java/plugin/plugin-content.yaml
index 81288744e448..dd17e530a078 100644
--- a/java/plugin/plugin-content.yaml
+++ b/java/plugin/plugin-content.yaml
@@ -68,6 +68,7 @@
   contentModules:
   - name: intellij.java.performancePlugin
   - name: intellij.java.compiler.charts
+  - name: intellij.java.terminal
 - name: lib/javac2.jar
   modules:
   - name: intellij.java.compiler.antTasks
diff --git a/java/plugin/resources/META-INF/plugin.xml b/java/plugin/resources/META-INF/plugin.xml
index 4ce5be55c713..e7608290a4f5 100644
--- a/java/plugin/resources/META-INF/plugin.xml
+++ b/java/plugin/resources/META-INF/plugin.xml
@@ -38,6 +38,7 @@
     <module name="intellij.java.unscramble"/>
     <module name="intellij.java.vcs"/>
     <module name="intellij.java.compiler.charts"/>
+    <module name="intellij.java.terminal"/>
   </content>
 
   <depends optional="true" config-file="intellij.java.remoteServers.impl.xml">com.intellij.modules.remoteServers</depends>
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt
index ca824f2ab485..75ce141a0050 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt
@@ -60,6 +60,7 @@ object JavaPluginLayout {
       spec.withModules(listOf(
         "intellij.java.compiler.impl",
         "intellij.java.debugger.impl",
+        "intellij.java.terminal",
         "intellij.java.debugger.memory.agent",
         "intellij.java.execution.impl",
         "intellij.java.ui",