diff --git a/dev-util/recaf-bin/Manifest b/dev-util/recaf-bin/Manifest
index 7bb6c16af..0ee0ed8a6 100644
--- a/dev-util/recaf-bin/Manifest
+++ b/dev-util/recaf-bin/Manifest
@@ -1,2 +1 @@
-DIST recaf-bin-2.19.6.jar 28031226 BLAKE2B 46ad24e2c3aa795bb67fc17a9eeff3f233989d786033c809602220bf47245369a6d500ad7ffa5709d7d1b50c2ccb7d2a05b55b8a0b611a9f1a8145c19ed8f19d SHA512 17e865321bf45de49deb022fb9c6e63b33f31ee0f286fefe7d093d459f1fecc861204634489ba2975fe0199d487d0ede92e2ab620f613e6f4d6567c9582146e8
-DIST recaf-bin-2.21.13.jar 20735307 BLAKE2B f4b056cd936b818a6996bc3317eb06efc231756fa707c59dad4de92f30ec39d904443507094a2f46996333aefca908924b09335afff07cde169e8e06b3c1ef05 SHA512 97e9bb1beb066a5fdab7976c956ebb66e891069cdfd857b2673702137bfc19d63fb23bef438f80e768a6b10b8c16ed18ed47e02d955bb0fa196a873320745816
+DIST recaf-bin-2.21.14.jar 21126400 BLAKE2B 01b4d7942d0f43ed3560f8ce8fce03a4721b980eb6deaa9ee2475d695a5a5f7892cee59229681a4c6e9eb0813242221abad8ab3a66a75421e97420c3e204644c SHA512 ec98868ac51b231d28efad9448de8b097965d8889c24faadcb155147424119ca252e5459dba70db7a3a18753dcce1dddc2872928194ac22087ecf68cc5890c1b
diff --git a/dev-util/recaf-bin/metadata.xml b/dev-util/recaf-bin/metadata.xml
index 8cd98f66f..6cc2093ef 100644
--- a/dev-util/recaf-bin/metadata.xml
+++ b/dev-util/recaf-bin/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="system-openjfx">Add OpenJFX support</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">Col-E/Recaf</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/recaf-bin/recaf-bin-2.21.13.ebuild b/dev-util/recaf-bin/recaf-bin-2.21.13.ebuild
deleted file mode 100644
index 2f6525c37..000000000
--- a/dev-util/recaf-bin/recaf-bin-2.21.13.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="recaf"
-#MY_PV="$(ver_cut 1-3)-redesign.$(ver_cut 5)"
-
-DESCRIPTION="A modern Java bytecode editor"
-HOMEPAGE="https://col-e.github.io/Recaf/"
-SRC_URI="https://github.com/Col-E/Recaf/releases/download/${PV}/recaf-${PV}-J8-jar-with-dependencies.jar -> ${P}.jar"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="system-openjfx"
-
-RDEPEND="system-openjfx? ( dev-java/openjfx )
-	virtual/jre:*"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	dodir "${S}"
-	cp -L "${DISTDIR}/${A}" "${S}/${MY_PN}.jar" || die
-}
-
-src_install() {
-	insinto "/opt/${MY_PN}/"
-	doins "${MY_PN}.jar"
-
-	newbin - ${MY_PN} <<-EOF
-		#!/bin/sh
-		FXLIB_PATH="/usr/lib64/openjfx-11/lib"
-
-		FXLIBS="\$FXLIB_PATH/javafx.base.jar:\$FXLIB_PATH/javafx.controls.jar:\
-\$FXLIB_PATH/javafx.graphics.jar:\
-/opt/${MY_PN}/recaf.jar"
-
-		java -cp \$FXLIBS me.coley.recaf.Recaf "--noupdate" "\$@"
-	EOF
-}
-
-pkg_postinst() {
-	if ! use system-openjfx; then
-		einfo "The tool is installed without system-openjfx use flag"
-		einfo "It will download openjfx during runtime into a home diretory"
-	fi
-}
diff --git a/dev-util/recaf-bin/recaf-bin-2.19.6.ebuild b/dev-util/recaf-bin/recaf-bin-2.21.14.ebuild
similarity index 96%
rename from dev-util/recaf-bin/recaf-bin-2.19.6.ebuild
rename to dev-util/recaf-bin/recaf-bin-2.21.14.ebuild
index 2f6525c37..d11fafd3e 100644
--- a/dev-util/recaf-bin/recaf-bin-2.19.6.ebuild
+++ b/dev-util/recaf-bin/recaf-bin-2.21.14.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PN="recaf"
 #MY_PV="$(ver_cut 1-3)-redesign.$(ver_cut 5)"
@@ -9,6 +9,7 @@ MY_PN="recaf"
 DESCRIPTION="A modern Java bytecode editor"
 HOMEPAGE="https://col-e.github.io/Recaf/"
 SRC_URI="https://github.com/Col-E/Recaf/releases/download/${PV}/recaf-${PV}-J8-jar-with-dependencies.jar -> ${P}.jar"
+S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="0"
@@ -19,8 +20,6 @@ RDEPEND="system-openjfx? ( dev-java/openjfx )
 	virtual/jre:*"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}"
-
 src_unpack() {
 	dodir "${S}"
 	cp -L "${DISTDIR}/${A}" "${S}/${MY_PN}.jar" || die