diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index ee0d8c776..b4254844d 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -23,7 +23,7 @@ _JDK_UPDATE_VERSION=65
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
 pkgver=${_java_ver}.u${_JDK_UPDATE_VERSION}_${_icedtea_ver}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://icedtea.classpath.org'
 license=('custom')
diff --git a/extra/java7-openjdk/jdk7-openjdk.install b/extra/java7-openjdk/jdk7-openjdk.install
index 01ad34c81..e4c13456c 100644
--- a/extra/java7-openjdk/jdk7-openjdk.install
+++ b/extra/java7-openjdk/jdk7-openjdk.install
@@ -13,7 +13,7 @@ post_install() {
   fi
 
   if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    JAVA_HOME=/usr/lib/jvm/java-default-runtime /usr/bin/init-jks-keystore
+    JAVA_HOME=/usr/lib/jvm/${this_java} /usr/bin/init-jks-keystore
   fi
 }
 
@@ -26,7 +26,7 @@ post_upgrade() {
   fi
 
   if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    JAVA_HOME=/usr/lib/jvm/java-default-runtime /usr/bin/init-jks-keystore
+    JAVA_HOME=/usr/lib/jvm/${this_java} /usr/bin/init-jks-keystore
   fi
 }
 
diff --git a/extra/java7-openjdk/jre7-openjdk-headless.install b/extra/java7-openjdk/jre7-openjdk-headless.install
index 99ad207cd..7b16a4008 100644
--- a/extra/java7-openjdk/jre7-openjdk-headless.install
+++ b/extra/java7-openjdk/jre7-openjdk-headless.install
@@ -15,7 +15,7 @@ post_install() {
   if [ ! -f /etc/ssl/certs/java/cacerts ]; then
     # Overwrite JAVA_HOME because if it still points at java-7-openjdk AND user just removed jdk,
     # Then /usr/bin/java will in the end, refer to /usr/lib/jvm/java-7-openjdk/java which doesn't exist
-    JAVA_HOME=/usr/lib/jvm/java-default-runtime /usr/bin/init-jks-keystore
+    JAVA_HOME=/usr/lib/jvm/${this_java} /usr/bin/init-jks-keystore
   fi
 }
 
@@ -28,7 +28,7 @@ post_upgrade() {
   fi
 
   if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    JAVA_HOME=/usr/lib/jvm/java-default-runtime /usr/bin/init-jks-keystore
+    JAVA_HOME=/usr/lib/jvm/${this_java} /usr/bin/init-jks-keystore
   fi
 }