diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild
index 12a7f6226b632..be82065881cbf 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit eutils java-vm-2 prefix versionator
 
@@ -180,6 +180,8 @@ src_prepare() {
 		mv "${WORKDIR}"/${JCE_DIR} jre/lib/security/ || die
 	fi
 
+	default
+
 	if [[ -n ${JAVA_PKG_STRICT} ]] ; then
 		# Mark this binary early to run it now.
 		pax-mark m ./bin/javap