diff --git a/x11-libs/libXaw3dXft/Manifest b/x11-libs/libXaw3dXft/Manifest
index 74c6e4a4b563b..b8c712d5efc03 100644
--- a/x11-libs/libXaw3dXft/Manifest
+++ b/x11-libs/libXaw3dXft/Manifest
@@ -1 +1,2 @@
 DIST libXaw3dXft-1.6.2h.tar.bz2 593436 BLAKE2B e0e5c3a3e5b4564d58bb059ad7eb594d1a46cc37e0e21799ea11892d206a57f3f11a46d7413310d2a43738f03e001f5dc6f8c3b86bbe806fbc651661e9f720db SHA512 bc9b6de80379bdc82c7f5cd46ac78a422282b018eed979ef5548d0382f43e53619a6ebaf40c6b9ae264d597536022dc1daf023c1d1a04e948d4b4658bc6479ca
+DIST libxaw3dxft-1.6.3.tar.xz 466804 BLAKE2B c7b2159ff40a84cbe2abfeec3419cb485c82c6a8daf20648a10feb03c9bde1f7f39930305e18d29ffd6161af24de3b1c52b1f06330ccd6b3f529a9f88cfb522e SHA512 1b0ef5ad62ec5e2f37635341605d5ae41a8b8a048f99b7cb1f2dd60e3bc87b5e4b4f9bc76cf7b95f5c0652c98829cecf4ff522a45c4a3c62dc56d61a4ad41d98
diff --git a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.3.ebuild b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.3.ebuild
new file mode 100644
index 0000000000000..9950136a5f81c
--- /dev/null
+++ b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xorg-3
+
+MY_PN=${PN,,}
+DESCRIPTION="Xaw3dXft library"
+HOMEPAGE="https://github.com/DaveFlater/libXaw3dXft"
+SRC_URI="https://github.com/DaveFlater/libXaw3dXft/releases/download/v${PV}/${MY_PN}-${PV}.tar.xz"
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+KEYWORDS="~amd64 ~x86"
+IUSE="xpm"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXmu
+	x11-libs/libXt
+	xpm? ( x11-libs/libXpm )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	app-alternatives/lex
+	app-alternatives/yacc
+	x11-misc/util-macros"
+
+QA_PKGCONFIG_VERSION="${PV//[!0-9.]}"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(usev xpm --enable-multiplane-bitmaps)
+
+		--enable-internationalization
+		--enable-arrow-scrollbars
+		--enable-gray-stipples
+	)
+	xorg-3_src_configure
+}
+
+src_install() {
+	xorg-3_src_install
+
+	rm -r "${ED}"/usr/share/doc/"${PF}"/README_pics/ || die
+}
diff --git a/x11-libs/libXaw3dXft/metadata.xml b/x11-libs/libXaw3dXft/metadata.xml
index 5318f2ee316ca..78f85c0e40f8b 100644
--- a/x11-libs/libXaw3dXft/metadata.xml
+++ b/x11-libs/libXaw3dXft/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sf-xpaint</remote-id>
+		<remote-id type="github">DaveFlater/libXaw3dXft</remote-id>
 	</upstream>
 </pkgmetadata>