diff --git a/srcpkgs/oracle-jdk/INSTALL b/srcpkgs/oracle-jdk/INSTALL
index 1fc1002e62d..5e9161d0eac 100644
--- a/srcpkgs/oracle-jdk/INSTALL
+++ b/srcpkgs/oracle-jdk/INSTALL
@@ -16,15 +16,15 @@ do_install() {
 	echo "$ORACLE_JDK_CHECKSUM  $BUILD_DIR/jdk.tar.gz" | sha256sum -c || return 1
 	tar xf ${BUILD_DIR}/jdk.tar.gz || return 1
 
-	if [ -d usr/share/java/$PKGNAME ]; then
-		rm -rf usr/share/java/$PKGNAME
+	if [ -d usr/lib/jvm/jdk$ORACLE_JDK_LONG_VERSION ]; then
+		rm -rf usr/lib/jvm/jdk$ORACLE_JDK_LONG_VERSION
 	fi
-	mv jdk$ORACLE_JDK_LONG_VERSION usr/share/java/$PKGNAME || return 1
+	mv jdk$ORACLE_JDK_LONG_VERSION usr/lib/jvm/jdk$ORACLE_JDK_LONG_VERSION || return 1
 }
 
 case "${ACTION}" in
 post)
-	. usr/share/java/oracle-jdk-vars.sh
+	. usr/lib/jvm/oracle-jdk-vars.sh
 	do_install
 	RESULT=$?
 	rm -r $BUILD_DIR
diff --git a/srcpkgs/oracle-jdk/REMOVE b/srcpkgs/oracle-jdk/REMOVE
index fd59e666bf9..64e30ce9e85 100644
--- a/srcpkgs/oracle-jdk/REMOVE
+++ b/srcpkgs/oracle-jdk/REMOVE
@@ -1,6 +1,6 @@
 case "$ACTION" in
 pre)
-	. usr/share/java/oracle-jdk-vars.sh
-	rm -r usr/share/java/$PKGNAME
+	. usr/lib/jvm/oracle-jdk-vars.sh
+	rm -r usr/lib/jvm/$PKGNAME
 	;;
 esac
diff --git a/srcpkgs/oracle-jdk/files/java-policy-settings.desktop.in b/srcpkgs/oracle-jdk/files/java-policy-settings.desktop.in
deleted file mode 100644
index ede6c92a8cd..00000000000
--- a/srcpkgs/oracle-jdk/files/java-policy-settings.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Exec=
-Icon=oracle-java.png
-Name[cs]=Nastavení politiky Java aplikací
-Name=Java Policy Settings
-Path=
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Settings;Java;
diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-128x128.png b/srcpkgs/oracle-jdk/files/oracle-jdk-128x128.png
deleted file mode 100644
index ce5ed56646e..00000000000
Binary files a/srcpkgs/oracle-jdk/files/oracle-jdk-128x128.png and /dev/null differ
diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-16x16.png b/srcpkgs/oracle-jdk/files/oracle-jdk-16x16.png
deleted file mode 100644
index fd3d59bdac0..00000000000
Binary files a/srcpkgs/oracle-jdk/files/oracle-jdk-16x16.png and /dev/null differ
diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-20x20.png b/srcpkgs/oracle-jdk/files/oracle-jdk-20x20.png
deleted file mode 100644
index afdcbe6ee6b..00000000000
Binary files a/srcpkgs/oracle-jdk/files/oracle-jdk-20x20.png and /dev/null differ
diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-22x22.png b/srcpkgs/oracle-jdk/files/oracle-jdk-22x22.png
deleted file mode 100644
index d8729408f82..00000000000
Binary files a/srcpkgs/oracle-jdk/files/oracle-jdk-22x22.png and /dev/null differ
diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-24x24.png b/srcpkgs/oracle-jdk/files/oracle-jdk-24x24.png
deleted file mode 100644
index 70a59d78b73..00000000000
Binary files a/srcpkgs/oracle-jdk/files/oracle-jdk-24x24.png and /dev/null differ
diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-256x256.png b/srcpkgs/oracle-jdk/files/oracle-jdk-256x256.png
deleted file mode 100644
index 59b568fb25c..00000000000
Binary files a/srcpkgs/oracle-jdk/files/oracle-jdk-256x256.png and /dev/null differ
diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-32x32.png b/srcpkgs/oracle-jdk/files/oracle-jdk-32x32.png
deleted file mode 100644
index 29441b46047..00000000000
Binary files a/srcpkgs/oracle-jdk/files/oracle-jdk-32x32.png and /dev/null differ
diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-40x40.png b/srcpkgs/oracle-jdk/files/oracle-jdk-40x40.png
deleted file mode 100644
index 789bb3cc8cd..00000000000
Binary files a/srcpkgs/oracle-jdk/files/oracle-jdk-40x40.png and /dev/null differ
diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-48x48.png b/srcpkgs/oracle-jdk/files/oracle-jdk-48x48.png
deleted file mode 100644
index c3b3cce4ab6..00000000000
Binary files a/srcpkgs/oracle-jdk/files/oracle-jdk-48x48.png and /dev/null differ
diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-512x512.png b/srcpkgs/oracle-jdk/files/oracle-jdk-512x512.png
deleted file mode 100644
index f9129d1a7ff..00000000000
Binary files a/srcpkgs/oracle-jdk/files/oracle-jdk-512x512.png and /dev/null differ
diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-64x64.png b/srcpkgs/oracle-jdk/files/oracle-jdk-64x64.png
deleted file mode 100644
index 79618c3c9c5..00000000000
Binary files a/srcpkgs/oracle-jdk/files/oracle-jdk-64x64.png and /dev/null differ
diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-72x72.png b/srcpkgs/oracle-jdk/files/oracle-jdk-72x72.png
deleted file mode 100644
index 0efbf9b689d..00000000000
Binary files a/srcpkgs/oracle-jdk/files/oracle-jdk-72x72.png and /dev/null differ
diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-96x96.png b/srcpkgs/oracle-jdk/files/oracle-jdk-96x96.png
deleted file mode 100644
index 2d46ccf0994..00000000000
Binary files a/srcpkgs/oracle-jdk/files/oracle-jdk-96x96.png and /dev/null differ
diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk.sh.in b/srcpkgs/oracle-jdk/files/oracle-jdk.sh.in
index b19cc1ef5da..4f6ef7b69d4 100644
--- a/srcpkgs/oracle-jdk/files/oracle-jdk.sh.in
+++ b/srcpkgs/oracle-jdk/files/oracle-jdk.sh.in
@@ -1,2 +1,2 @@
-export JAVA_HOME=${JAVA_HOME=/usr/share/java/oracle-jdk}
-export PATH="$PATH:/usr/share/java/oracle-jdk/bin"
+export JAVA_HOME=${JAVA_HOME=/usr/jvm/jdk%LONG_VERSION%/oracle-jdk}
+export PATH="$PATH:/usr/lib/jvm/jdk%LONG_VERSION%/bin"
diff --git a/srcpkgs/oracle-jdk/template b/srcpkgs/oracle-jdk/template
index 7a53927d8e7..df43ed4bd03 100644
--- a/srcpkgs/oracle-jdk/template
+++ b/srcpkgs/oracle-jdk/template
@@ -1,9 +1,9 @@
 # Template file for 'oracle-jdk'
 pkgname=oracle-jdk
-version=8u11
-_longVersion=1.8.0_11
+version=8u20
+_longVersion=1.8.0_20
 revision=1
-_build=12
+_build=26
 
 short_desc="Java Development Kit (JDK)"
 maintainer="Enno Boland <eb@s01.de>"
@@ -14,20 +14,19 @@ nonfree=yes
 only_for_archs="i686 x86_64"
 depends="hicolor-icon-theme desktop-file-utils xdg-utils shared-mime-info wget"
 hostmakedepends="wget"
-provides="java-runtime-${version}_1 oracle-jre-${version}_${revision}"
-conflicts="oracle-jre>=0"
-replaces="java-runtime>=0 oracle-jre>=0"
+provides="java-runtime-${version}_1"
+replaces="java-runtime>=0"
 
 case "${XBPS_TARGET_MACHINE}" in
 x86_64)
 	_arch=amd64
 	_filename=jdk-${version}-linux-x64.tar.gz
-	checksum="f3593b248b64cc53bf191f45b92a1f10e8c5099c2f84bd5bd5d6465dfd07a8e9"
+	checksum="3e717622ae48af5ca7298e7797cb71d4d545238f362741a83e69c097ca055de4"
 	;;
 i686)
 	_arch=i386
 	_filename=jdk-${version}-linux-i586.tar.gz
-	checksum="3981e6fb7d35b20ac3c05ec56fb3798ac1cd872a9e968bb3d77a718af7b146d1"
+	checksum="fa013b3fcbb1308040bf0e75bbd6ef7e8396b547cbc8dd79e3cb8153604bfd06"
 	;;
 esac
 
@@ -52,36 +51,21 @@ do_extract() {
 do_build() {
 	sed \
 		-e "s|%LONG_VERSION%|${_longVersion}|" \
-			${FILESDIR}/oracle-jdk.sh.in > oracle-jdk.sh
+			${FILESDIR}/oracle-jdk.sh.in > 10_oracle-jdk.sh
 	sed \
 		-e "s|%LONG_VERSION%|${_longVersion}|" \
 		-e "s|%ORACLE_JDK_URL%|${distfiles}|" \
 		-e "s|%ORACLE_JDK_CHECKSUM%|${checksum}|" \
 			${FILESDIR}/oracle-jdk-vars.sh.in > oracle-jdk-vars.sh
-	sed \
-		-e "s|^Exec=|Exec=/usr/share/java/$pkgname/bin/policytool|" \
-			${FILESDIR}/java-policy-settings.desktop.in > java-policy-settings.desktop
 }
 
 do_install() {
+	vmkdir "usr/lib/jvm"
+	vinstall oracle-jdk-vars.sh 644 "usr/lib/jvm"
+
 	vmkdir "usr/share/licenses/${pkgname}"
-	vmkdir "usr/share/java/$pkgname/jre"
-	vinstall oracle-jdk-vars.sh 644 "usr/share/java"
-
 	vlicense LICENSE
-	vinstall java-policy-settings.desktop 644 usr/share/applications
-
-	ln -sr $DESTDIR/usr/share/java/$pkgname/jre $DESTDIR/usr/share/java/oracle-jre
-
-	for i in 16 20 22 24 32 40 48 64 72 96 128 256 512; do
-		vinstall $FILESDIR/oracle-jdk-${i}x${i}.png 644 usr/share/icons/hicolor/${i}x${i}/apps oracle-java.png
-	done
-
-	vmkdir "usr/lib/mozilla/plugins"
-	ln -srf ${DESTDIR}/usr/share/java/oracle-jre/lib/${_arch}/libnpjp2.so \
-		${DESTDIR}/usr/lib/mozilla/plugins
-
 
 	vmkdir "etc/profile.d"
-	vinstall oracle-jdk.sh 644 "etc/profile.d"
+	vinstall 10_oracle-jdk.sh 644 "etc/profile.d"
 }
diff --git a/srcpkgs/oracle-jre/template b/srcpkgs/oracle-jre/template
index 63fcfb1a729..979180dcde8 100644
--- a/srcpkgs/oracle-jre/template
+++ b/srcpkgs/oracle-jre/template
@@ -47,7 +47,7 @@ do_fetch() {
 do_build() {
 	sed \
 		-e "s|%LONG_VERSION%|${_longVersion}|" \
-			${FILESDIR}/oracle-jre.sh.in > oracle-jre.sh
+			${FILESDIR}/oracle-jre.sh.in > 11_oracle-jre.sh
 	sed \
 		-e "s|%LONG_VERSION%|${_longVersion}|" \
 		-e "s|%ORACLE_JRE_URL%|${distfiles}|" \