diff --git a/Ghidra/RuntimeScripts/build.gradle b/Ghidra/RuntimeScripts/build.gradle
index f70ebaa803..cc665f5b3b 100644
--- a/Ghidra/RuntimeScripts/build.gradle
+++ b/Ghidra/RuntimeScripts/build.gradle
@@ -39,6 +39,10 @@ rootProject.PLATFORMS.each { platform ->
 			t.from ("${p.projectDir}/Linux/server") {
 				into "server"
 			}
+			t.from ("${rootProject.projectDir}") {
+				include "gradlew"
+				into "support/gradle"
+			}
 			t.from (p.file("Linux/ghidraRun")) 
 		}
 
@@ -49,8 +53,12 @@ rootProject.PLATFORMS.each { platform ->
 			t.from ("${p.projectDir}/Windows/server") {
 				into "server"
 			}
+			t.from ("${rootProject.projectDir}") {
+				include "gradlew.bat"
+				into "support/gradle"
+			}
 			t.from (p.file("Windows/ghidraRun.bat"))
-		}		
+		}
 	}
 }
 
diff --git a/gradle/root/distribution.gradle b/gradle/root/distribution.gradle
index 5f22665f10..06c8ecfe11 100644
--- a/gradle/root/distribution.gradle
+++ b/gradle/root/distribution.gradle
@@ -392,19 +392,6 @@ project.PLATFORMS.each { platform ->
 		// Make sure that we don't try to copy the same file with the same path into the
 		// zip (this can happen!)
 		duplicatesStrategy 'exclude'
-		
-		/////////////////////////////////
-		// Gradle Wrapper
-		/////////////////////////////////
-		from (ROOT_PROJECT_DIR) {
-			if (isLinux(platform.name) || isMac(platform.name)) {
-				include "gradlew"
-			}
-			if (isWindows(platform.name)) {
-				include "gradlew.bat"
-			}
-			into "support/gradle"
-		}	
 	}
 }