diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r5.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r6.ebuild
similarity index 97%
rename from dev-java/lz4-java/lz4-java-1.8.0-r5.ebuild
rename to dev-java/lz4-java/lz4-java-1.8.0-r6.ebuild
index 1eca00a9a5893..4f6cc6a110a72 100644
--- a/dev-java/lz4-java/lz4-java-1.8.0-r5.ebuild
+++ b/dev-java/lz4-java/lz4-java-1.8.0-r6.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	app-arch/lz4:=
-	dev-java/mvel:2.5
+	dev-java/mvel:0
 	dev-libs/xxhash:0
 	>=virtual/jdk-1.8:*
 	test? ( dev-java/randomized-runner:0 )"
@@ -52,7 +52,7 @@ src_compile() {
 	einfo "Code generation"
 	"$(java-config -J)" \
 		-Dout.dir="src/java" \
-		-cp "$(java-pkg_getjars --build-only mvel-2.5)" \
+		-cp "$(java-pkg_getjars --build-only mvel)" \
 		org.mvel2.sh.Main \
 		src/build/gen_sources.mvel \
 		|| die
diff --git a/dev-java/mvel/mvel-2.5.0.ebuild b/dev-java/mvel/mvel-2.5.0-r1.ebuild
similarity index 99%
rename from dev-java/mvel/mvel-2.5.0.ebuild
rename to dev-java/mvel/mvel-2.5.0-r1.ebuild
index dc7079a91c1c4..52097f6f110de 100644
--- a/dev-java/mvel/mvel-2.5.0.ebuild
+++ b/dev-java/mvel/mvel-2.5.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/mvel/mvel/archive/mvel2-${PV}.Final.tar.gz"
 S="${WORKDIR}/${PN}-${PN}2-${PV}.Final"
 
 LICENSE="Apache-2.0"
-SLOT="2.5"
+SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="