diff --git a/java/java-terminal/resources/messages/JavaTerminalBundle.properties b/java/java-terminal/resources/messages/JavaTerminalBundle.properties
index b6fec38baffd..591ceb5388e0 100644
--- a/java/java-terminal/resources/messages/JavaTerminalBundle.properties
+++ b/java/java-terminal/resources/messages/JavaTerminalBundle.properties
@@ -79,5 +79,11 @@ java.command.terminal.enable.preview.option.description=Allows classes to depend
 java.command.terminal.verbose.option.description=Enables verbose output for the given subsystem.
 java.command.terminal.verbose.option.argument.text.8=class|gc|gni
 java.command.terminal.verbose.option.argument.text.11=class|module|gc|gni
+java.command.terminal.agentlib.option.description=Loads native agent library \\<libname\\>.
+java.command.terminal.agentlib.option.argument.text=<libname>[=<options>]
+java.command.terminal.agentpath.option.description=Loads native agent library by full \\&lt;pathname\\&gt;.
+java.command.terminal.agentpath.option.argument.text=<pathname>[=<options>]
+java.command.terminal.javaagent.option.description=Loads Java programming language agent by \\&ltjarpath\\&gt;.
+java.command.terminal.javaagent.option.argument.text=<jarpath>[=<options>]
 error.stream.name=error
 output.stream.name=output
\ 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
index cddb4c2957d0..2edbb14bcc0b 100644
--- a/java/java-terminal/src/com/intellij/java/terminal/JavaShellCommandSpecsProvider.kt
+++ b/java/java-terminal/src/com/intellij/java/terminal/JavaShellCommandSpecsProvider.kt
@@ -90,6 +90,34 @@ class JavaShellCommandSpecsProvider : ShellCommandSpecsProvider {
         isOptional = true
       }
     }
+
+    option("-agentlib") {
+      description(JavaTerminalBundle.message("java.command.terminal.agentlib.option.description"))
+      separator = ":"
+      repeatTimes = 0
+      argument {
+        displayName(JavaTerminalBundle.message("java.command.terminal.agentlib.option.argument.text"))
+      }
+    }
+
+    option("-agentpath") {
+      description(JavaTerminalBundle.message("java.command.terminal.agentpath.option.description"))
+      separator = ":"
+      repeatTimes = 0
+      argument {
+        displayName(JavaTerminalBundle.message("java.command.terminal.agentpath.option.argument.text"))
+      }
+    }
+
+    option("-javaagent") {
+      description(JavaTerminalBundle.message("java.command.terminal.javaagent.option.description"))
+      separator = ":"
+      repeatTimes = 0
+      argument {
+        displayName(JavaTerminalBundle.message("java.command.terminal.agentpath.option.argument.text"))
+      }
+    }
+
     argument {
       displayName(JavaTerminalBundle.message("java.command.terminal.argument.main.class.text"))
       suggestions(ShellDataGenerators.fileSuggestionsGenerator())