diff --git a/dev-java/bsh/bsh-2.1.1-r1.ebuild b/dev-java/bsh/bsh-2.1.1-r2.ebuild
similarity index 97%
rename from dev-java/bsh/bsh-2.1.1-r1.ebuild
rename to dev-java/bsh/bsh-2.1.1-r2.ebuild
index ad59a52c5953e..09611c4cd875c 100644
--- a/dev-java/bsh/bsh-2.1.1-r1.ebuild
+++ b/dev-java/bsh/bsh-2.1.1-r2.ebuild
@@ -31,8 +31,10 @@ CP_DEPEND="
 RDEPEND="${CP_DEPEND}
 	>=virtual/jre-1.8:*"
 
+# restrict to max Java 25
+# https://bugs.openjdk.org/browse/JDK-8359053
 DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
+	<=virtual/jdk-25:*"
 
 DOCS=(
 	CHANGES.md