diff --git a/build.gradle b/build.gradle
index 6ebf90ba4..d63a6e38a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -176,6 +176,14 @@ tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"
 }
 
+/*
+ * Remove the "release" file produced by jlink
+ */
+jre {
+    doLast {
+        delete file("${buildDir}/jre/release")
+    }
+}
 
 /*
  * Set the basic Java runtime parameters (heap size etc.)
@@ -217,7 +225,7 @@ startScripts {
  * Build the JVM runtime using jlink
  */
 runtime {
-    options = ["--compress=2", "--vm=server", "--no-header-files", "--no-man-pages"]
+    options = ["--compress=2", "--vm=server", "--no-header-files", "--no-man-pages", "--output", "jre/jre"]
     modules = ["java.desktop",
                "java.logging",
                "java.rmi",