diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index 71b39fa46d96..5b80441beb32 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -198,12 +198,14 @@ binding.setVariable("notifyArtifactBuilt", { String artifactPath ->
   projectBuilder.info("##teamcity[publishArtifacts '$relativePath']")
 })
 
-def suspendUntilDebuggerConnect = System.getProperty("debug.suspend") ?: "n"
-def debugPort = System.getProperty("debug.port") ?: 5555
-if (suspendUntilDebuggerConnect == 'y') {
-  println """\
-------------->----------- This process is suspended until remote debugger connects to the port $debugPort ----<----
--------------------------------------------^------^------^------^------^------^------^-----------------------
+def debugPort = System.getProperty("debug.port")
+def debugSuspend = System.getProperty("debug.suspend") ?: "n"
+if (debugSuspend == 'y') {
+  println """
+
+------------->------------- The process suspended until remote debugger connects to debug port -------------<-------------
+---------------------------------------^------^------^------^------^------^------^----------------------------------------
+
 """
 }
 
@@ -243,16 +245,19 @@ binding.setVariable("wireBuildDate", { String buildNumber, String appInfoFile ->
 })
 
 binding.setVariable("commonJvmArgs", {
+  def jdwp = "-Xrunjdwp:transport=dt_socket,server=y,suspend=$debugSuspend"
+  if (debugPort != null) jdwp += ",address=$debugPort"
   return [
-   "-ea",
-   "-server",
-   "-Didea.home.path=$home",
-   "-Xbootclasspath/p:${projectBuilder.moduleOutput(findModule("boot"))}",
-   "-XX:+HeapDumpOnOutOfMemoryError",
-   "-Didea.system.path=${p("teamcity.build.tempDir")}/system",
-   "-Didea.config.path=${p("teamcity.build.tempDir")}/config",
-   "-Xdebug",
-   "-Xrunjdwp:transport=dt_socket,server=y,suspend=$suspendUntilDebuggerConnect,address=$debugPort"]
+    "-ea",
+    "-server",
+    "-Xbootclasspath/p:${projectBuilder.moduleOutput(findModule("boot"))}",
+    "-XX:+HeapDumpOnOutOfMemoryError",
+    "-Didea.home.path=$home",
+    "-Didea.config.path=${p("teamcity.build.tempDir")}/config",
+    "-Didea.system.path=${p("teamcity.build.tempDir")}/system",
+    "-Xdebug",
+    jdwp
+  ]
 })
 
 binding.setVariable("classPathLibs", [