diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r1.ebuild
similarity index 99%
rename from dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4.ebuild
rename to dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r1.ebuild
index fee4dd82f8899..216d6da221787 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r1.ebuild
@@ -67,11 +67,14 @@ RDEPEND="!x64-macos? (
 			)
 		)
 	)
+	!prefix? (
+		dev-libs/elfutils
+		sys-libs/glibc:*
+	)
 	alsa? ( media-libs/alsa-lib )
 	cups? ( net-print/cups )
 	doc? ( dev-java/java-sdk-docs:${SLOT} )
 	fontconfig? ( media-libs/fontconfig:1.0 )
-	!prefix? ( sys-libs/glibc:* )
 	selinux? ( sec-policy/selinux-java )"
 
 pkg_nofetch() {