diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
index 6e7d360c718..8f942c0639c 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -115,6 +115,7 @@ PLATFORM_MODULES += \
     #
 
 JRE_TOOL_MODULES += \
+    jdk.jdwp.agent \
     jdk.pack200 \
     jdk.scripting.nashorn.shell \
     #