diff --git a/dev-java/openjdk-bin/openjdk-bin-8.222_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
similarity index 98%
rename from dev-java/openjdk-bin/openjdk-bin-8.222_p10.ebuild
rename to dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
index 05ab88cb032b7..c9b8c2cf4c916 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.222_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
@@ -71,7 +71,7 @@ src_install() {
 	fi
 
 	if use headless-awt ; then
-		rm -fvr jre/lib/*/lib*{[jx]awt,splashscreen}* \
+		rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
 			{,jre/}bin/policytool bin/appletviewer || die
 	fi