diff --git a/Makefile b/Makefile
index ec23843f..00abcde3 100644
--- a/Makefile
+++ b/Makefile
@@ -465,25 +465,40 @@ endif
 ifeq ($(OS), MACOSX)
 -Pbuild-jre-linux -Pbuild-jre-win32 -Pbuild-jre-win64 -Pbuild-jre-mac : src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7/jdk-17.0.7+7
 ifndef DUMP_PROFILES
-	rm("target/classes");                                \
+	rm("target/classes");
+ifdef FOR_DEBUGGING
+	exec(env("JAVA_HOME", "$(CURDIR)/$</Contents/Home"), \
+	     "$(MVN)", "-f", "build-jre.xml", "jlink:jlink", "$@", "-Pinclude-jdwp-agent");
+else
 	exec(env("JAVA_HOME", "$(CURDIR)/$</Contents/Home"), \
 	     "$(MVN)", "-f", "build-jre.xml", "jlink:jlink", "$@");
+endif # FOR_DEBUGGING
 endif
 else ifeq ($(OS), WINDOWS)
 -Pbuild-jre-linux -Pbuild-jre-win32 -Pbuild-jre-win64                 : src/main/jre/OpenJDK17U-jdk_x64_windows_hotspot_17.0.7_7/jdk-17.0.7+7
 ifndef DUMP_PROFILES
-	rm("target/classes");                                \
+	rm("target/classes");
+ifdef FOR_DEBUGGING
+	exec(env("JAVA_HOME", "$(CURDIR)/$<"),               \
+	     "$(MVN)", "-f", "build-jre.xml", "jlink:jlink", "$@", "-Pinclude-jdwp-agent");
+else
 	exec(env("JAVA_HOME", "$(CURDIR)/$<"),               \
 	     "$(MVN)", "-f", "build-jre.xml", "jlink:jlink", "$@");
 endif
+endif
 else
 -Pbuild-jre-linux -Pbuild-jre-win32 -Pbuild-jre-win64                 : src/main/jre/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7/jdk-17.0.7+7
 ifndef DUMP_PROFILES
-	rm("target/classes");                                \
+	rm("target/classes");
+ifdef FOR_DEBUGGING
+	exec(env("JAVA_HOME", "$(CURDIR)/$<"),               \
+	     "$(MVN)", "-f", "build-jre.xml", "jlink:jlink", "$@", "-Pinclude-jdwp-agent");
+else
 	exec(env("JAVA_HOME", "$(CURDIR)/$<"),               \
 	     "$(MVN)", "-f", "build-jre.xml", "jlink:jlink", "$@");
 endif
 endif
+endif
 
 # for dependencies to jmods
 -Pbuild-jre-mac   : src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7/jdk-17.0.7+7
diff --git a/build-jre.xml b/build-jre.xml
index fc8cbe75..763831c8 100644
--- a/build-jre.xml
+++ b/build-jre.xml
@@ -39,6 +39,23 @@
     </pluginManagement>
   </build>
   <profiles>
+    <profile>
+      <id>include-jdwp-agent</id>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <artifactId>maven-jlink-plugin</artifactId>
+              <configuration>
+                <addModules combine.children="append">
+                  <addModule>jdk.jdwp.agent</addModule>
+                </addModules>
+              </configuration>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
     <profile>
       <id>build-jre-linux</id>
       <!--