diff --git a/extra/java9-openjdk/PKGBUILD b/extra/java9-openjdk/PKGBUILD
index c3c43f8a6..f2ccdbf02 100644
--- a/extra/java9-openjdk/PKGBUILD
+++ b/extra/java9-openjdk/PKGBUILD
@@ -28,7 +28,7 @@ pkgbase=java$_majorver-openjdk
 pkgver=$_majorver.u$_updatever
 _hg_tag="jdk-$_majorver+$_updatever"
 _repo_ver=jdk$_java_ver.$_hg_tag
-pkgrel=3
+pkgrel=4
 _pkg_full_ver=$pkgver-$pkgrel
 arch=('i686' 'x86_64')
 url='http://openjdk.java.net/'
@@ -151,6 +151,9 @@ build() {
     #--disable-javac-server
 
   make images
+
+  # https://bugs.openjdk.java.net/browse/JDK-8173610
+  find "../$_imgdir" -iname '*.so' -exec chmod +x {} \;
 }
 
 # check() {
@@ -213,6 +216,8 @@ package_jre9-openjdk-headless() {
   # Link JKS keystore from ca-certificates-utils
   rm -f "$pkgdir$_jvmdir/lib/security/cacerts"
   ln -sf /etc/ssl/certs/java/cacerts "$pkgdir$_jvmdir/lib/security/cacerts"
+
+  find "$pkgdir$_jvmdir" -iname '*.diz' -exec rm {} \;
 }
 
 package_jre9-openjdk() {
@@ -235,6 +240,8 @@ package_jre9-openjdk() {
   # Licenses
   install -d -m 755 "$pkgdir/usr/share/licenses"
   ln -s $pkgbase "$pkgdir/usr/share/licenses/$pkgname"
+
+  find "$pkgdir$_jvmdir" -iname '*.diz' -exec rm {} \;
 }
 
 package_jdk9-openjdk() {
@@ -291,6 +298,8 @@ package_jdk9-openjdk() {
       "$srcdir/freedesktop-$f.desktop" \
       "$pkgdir/usr/share/applications/$f-$pkgbase.desktop"
   done
+
+  find "$pkgdir$_jvmdir" -iname '*.diz' -exec rm {} \;
 }
 
 package_openjdk9-src() {