diff --git a/gradle.properties b/gradle.properties
index 976933ba20..506214ca9e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,9 @@
 # Increase maximum Gradle heap size (default is 1G)
 # And fix build in locales with non-default capitalizations (e.g. tr_TR)
 org.gradle.jvmargs=-Xmx2G -Duser.language=en -Duser.country=US
+
+# Preserve file system permissions in archives (Gradle 9 uses fixed permissions by default)
+org.gradle.archives.use-file-system-permissions=true
+
+# Set Ghidra protobuf version
 ghidra.protobuf.java.version=4.31.0
diff --git a/gradlew b/gradlew
index 5650f893ce..72670208f6 100755
--- a/gradlew
+++ b/gradlew
@@ -128,7 +128,7 @@ fi
 # Read application properties
 while IFS='=' read -r key value
 do
-    key=$(echo $key | tr '.' '_')
+    key=$(echo $key | tr '.-' '_')
     eval ${key}=\${value}
 done < "${GHIDRA_HOME}/Ghidra/application.properties"