diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/Main.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/Main.java
index b99598aa4de2..45e6328d60eb 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/Main.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/Main.java
@@ -342,6 +342,9 @@ private List<String> getJavacOpts(String... runtimeArgs) throws Fault {
                     }
                     break;
                 default:
+                    if (opt.startsWith("-agentlib:jdwp=") || opt.startsWith("-Xrunjdwp:")) {
+                        javacOpts.add("-g");
+                    }
                     // ignore all other runtime args
             }
         }