diff --git a/dev-java/openjfx-bin/Manifest b/dev-java/openjfx-bin/Manifest
new file mode 100644
index 000000000..831f1c8b0
--- /dev/null
+++ b/dev-java/openjfx-bin/Manifest
@@ -0,0 +1,4 @@
+DIST javafx-base-21.0.7-linux.jar 753989 BLAKE2B cde700a1e377252e19e2d82a82f073bf2069f5d8c337662e3361e1b066d9652e70a14dde4d79b4e36b176bdb2e54189adc8993c7688c33eebbc51b7fb8272cf6 SHA512 08c77293cb1385faff9d754498aa40a3e13a3f5546a7eb11c49299cb821ea48042d3ad9f76aa90fe7d68c6d328e46cafffe3c9877aaa5e3c22fb716e93cb102a
+DIST javafx-controls-21.0.7-linux.jar 2585211 BLAKE2B 156c681b024f5b8ea9a3803140f7d4d760d17abc4bf5ac49ae7d8236b2407bc2f5d705eb3aa22d1509e4cb0544d256c7454baf6055e8725b031f90ee9f9d0b4c SHA512 1f0936a2cb112252a2d68d6f8079242fe6ceea4316e5bd05c32edb074bca9b7af76ad0b11088909b45f6380c80c6d1c71da85770ecc1b2d1c1adb8db88e6e9ae
+DIST javafx-graphics-21.0.7-linux.jar 4697444 BLAKE2B b4e4a7f0c2bcd81eef9d87128d2f3a911b2c7ce08c15291b475ef584b325cf44c076312b48bc6244b1a750ebffb3972468cb6acaffc0b7fa7b0710c147909031 SHA512 7273407ac55f6ecc9cbbbd9dab8762e832bedfc9710ff888219bec8ff296ec6fa0f8b10b72ab8f043d80b2b97d2e152795b5a300142f3b1ed30a920523e17f83
+DIST javafx-media-21.0.7-linux.jar 1507586 BLAKE2B aa716fb576e52ceb385ca67bf99593e7fb5c000aea8d74c929e3f5989d8dcbd4fb2a6d8d07511305bf0911952b75cc58a2a5d7f0a62eee061937d045756b5a9c SHA512 cc152976fcaf7bf4a621c01877a6cfe4fc6d01dcb3d4e8f8d05921becc4c4af31dbadfc77c0b4048d6b761a1a87265a1e43dee6dff44a59f25e61e35a73ae5eb
diff --git a/dev-java/openjfx-bin/openjfx-bin-21.0.7.ebuild b/dev-java/openjfx-bin/openjfx-bin-21.0.7.ebuild
new file mode 100644
index 000000000..36b5ebb4d
--- /dev/null
+++ b/dev-java/openjfx-bin/openjfx-bin-21.0.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-utils-2
+
+DESCRIPTION="Java OpenJFX client application platform"
+HOMEPAGE="https://gluonhq.com/products/javafx/"
+SRC_URI="
+https://repo1.maven.org/maven2/org/openjfx/javafx-base/${PV}/javafx-base-${PV}-linux.jar
+https://repo1.maven.org/maven2/org/openjfx/javafx-controls/${PV}/javafx-controls-${PV}-linux.jar
+https://repo1.maven.org/maven2/org/openjfx/javafx-graphics/${PV}/javafx-graphics-${PV}-linux.jar
+https://repo1.maven.org/maven2/org/openjfx/javafx-media/${PV}/javafx-media-${PV}-linux.jar
+"
+S="${WORKDIR}/"
+
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="${PV%%[.+]*}"
+KEYWORDS="amd64"
+
+DEPEND="
+	dev-java/openjdk-bin:${SLOT}
+"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	dodir "${S}"
+
+	for MY_A in $A; do
+		cp -L "${DISTDIR}/${MY_A}" "${S}/${MY_A}" || die
+		echo "${MY_A}"
+	done
+}
+
+src_install() {
+	java-pkg_newjar javafx-base-${PV}-linux.jar javafx.base.jar
+	java-pkg_newjar javafx-controls-${PV}-linux.jar javafx.controls.jar
+	java-pkg_newjar javafx-graphics-${PV}-linux.jar javafx.graphics.jar
+	java-pkg_newjar javafx-media-${PV}-linux.jar javafx.media.jar
+}
diff --git a/dev-util/recaf-bin/recaf-bin-2.21.14.ebuild b/dev-util/recaf-bin/recaf-bin-2.21.14.ebuild
index d11fafd3e..90c9ea75e 100644
--- a/dev-util/recaf-bin/recaf-bin-2.21.14.ebuild
+++ b/dev-util/recaf-bin/recaf-bin-2.21.14.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MY_PN="recaf"
-#MY_PV="$(ver_cut 1-3)-redesign.$(ver_cut 5)"
+JAVA_SLOT=21
 
 DESCRIPTION="A modern Java bytecode editor"
 HOMEPAGE="https://col-e.github.io/Recaf/"
@@ -16,8 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="system-openjfx"
 
-RDEPEND="system-openjfx? ( dev-java/openjfx )
-	virtual/jre:*"
+RDEPEND="system-openjfx? ( dev-java/openjfx-bin:${JAVA_SLOT} )
+	dev-java/openjdk-bin:${JAVA_SLOT}"
 DEPEND="${RDEPEND}"
 
 src_unpack() {
@@ -29,9 +29,10 @@ src_install() {
 	insinto "/opt/${MY_PN}/"
 	doins "${MY_PN}.jar"
 
+#		FXLIB_PATH="/usr/lib64/openjfx-11/lib"
 	newbin - ${MY_PN} <<-EOF
 		#!/bin/sh
-		FXLIB_PATH="/usr/lib64/openjfx-11/lib"
+		FXLIB_PATH="/usr/share/openjfx-bin-${JAVA_SLOT}/lib"
 
 		FXLIBS="\$FXLIB_PATH/javafx.base.jar:\$FXLIB_PATH/javafx.controls.jar:\
 \$FXLIB_PATH/javafx.graphics.jar:\