diff --git a/build.xml b/build.xml
index 40872c86..dc8ad762 100644
--- a/build.xml
+++ b/build.xml
@@ -89,6 +89,15 @@
 
 		<!-- libjfxwebkit.dylib has many dependencies to deprecated librararies that cause issues with MAS review -->
 		<exclude name="**/libjfxwebkit.dylib" />
+
+		<!-- strip executable -->
+		<exclude name="**/bin/**" />
+		<include name="**/java" />
+
+		<!-- strip JDK -->
+		<exclude name="**/include/**" />
+		<exclude name="**/jmods/**" />
+		<exclude name="**/legal/**" />
 	</patternset>
 
 
@@ -125,7 +134,7 @@
 			<exec executable="get-java.sh" dir="${dir.cache}" failonerror="yes">
 				<arg line="get jfx x86_64 Darwin" />
 			</exec>
-			<unzip src="${dir.cache}/openjfx-${jfx.version}_osx-x64_bin-sdk.zip" dest="@{dest}/ext/modules">
+			<unzip src="${dir.cache}/openjfx-${jfx.version}_osx-x64_bin-sdk.zip" dest="@{dest}/jdk-${jre.version}.jdk/Contents/Home/ext/modules">
 				<cutdirsmapper dirs="1" />
 			</unzip>
 		</sequential>