diff --git a/sys-apps/ethq/Manifest b/sys-apps/ethq/Manifest
index 3c03cf67dacc9..cab1dbdd2f1e4 100644
--- a/sys-apps/ethq/Manifest
+++ b/sys-apps/ethq/Manifest
@@ -1 +1,2 @@
 DIST ethq-0_6_1.tar.gz 23475 BLAKE2B 04d933294ba432ed69108022b0a2b13c47537902f66c6969bbd5afca144a977a6215a2164cbefd975d0f599bd8503feca79ef9e38856d8c9e6943c2cd2c3f99f SHA512 72c38ecb0cb6c7d6f522d99f2a6ec08bd2c42065d5f83d86890706a52420006fcdb5774a1457a66ccd5e174113e09c2a4285d311af334616a01c32ad8753126d
+DIST ethq-0_6_3.tar.gz 32610 BLAKE2B c381eeea2192397084968894fb7f272b4129f1ffd6492b33c0012f0e2d874ba08f5feea3b218c7c57190c31997d39c78fce037e2a2fb55677d7ccf9009b2fab6 SHA512 400c443dab051f121542e81639036071386f79557bd60cf34d744ec5fde193464a0d745a3d818ea1a88698d02264440ec2008c7cd0f4e70a426f18e4f71e0fad
diff --git a/sys-apps/ethq/ethq-0.6.3.ebuild b/sys-apps/ethq/ethq-0.6.3.ebuild
new file mode 100644
index 0000000000000..917a1697503d2
--- /dev/null
+++ b/sys-apps/ethq/ethq-0.6.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+MY_PV=${PV//./_}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Ethernet NIC Queue stats viewer"
+HOMEPAGE="https://github.com/isc-projects/ethq"
+SRC_URI="https://github.com/isc-projects/ethq/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="sys-libs/ncurses:="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	# respect FLAGS, remove Werror and strip
+	sed -i  -e '/CXXFLAGS/s/= -O3/+=/' \
+		-e '/CXXFLAGS/s/ -Werror//' \
+		-e '/LDFLAGS/s/= -s/+=/' Makefile || die "sed failed for Makefile"
+
+	if ! use test ; then
+		sed -i '/TARGETS/s/ethq_test//' Makefile \
+			|| die "sed failed for USE flag test"
+	fi
+}
+
+src_configure() {
+	# https://github.com/isc-projects/ethq/issues/30 (bug #879893)
+	filter-lto
+
+	default
+}
+
+src_test() {
+	local driver
+	for driver in tests/* ; do
+		"${S}"/ethq_test "$(basename "${driver%%-*}")" "${driver}" \
+			|| die "test failed on ${driver}"
+	done
+}
+
+src_install() {
+	einstalldocs
+	dobin ethq
+}
diff --git a/sys-apps/ethq/ethq-9999.ebuild b/sys-apps/ethq/ethq-9999.ebuild
index da954c3b0cc6f..c414380f9b298 100644
--- a/sys-apps/ethq/ethq-9999.ebuild
+++ b/sys-apps/ethq/ethq-9999.ebuild
@@ -1,33 +1,30 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 EGIT_REPO_URI="https://github.com/isc-projects/${PN}.git"
 
-inherit git-r3 flag-o-matic toolchain-funcs
+inherit git-r3 flag-o-matic
 
 DESCRIPTION="Ethernet NIC Queue stats viewer"
 HOMEPAGE="https://github.com/isc-projects/ethq"
-SRC_URI=""
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS=""
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="sys-libs/ncurses:="
 RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
 
-	# Respect FLAGS, remove Werror
+	# respect FLAGS, remove Werror and strip
 	sed -i  -e '/CXXFLAGS/s/= -O3/+=/' \
 		-e '/CXXFLAGS/s/ -Werror//' \
-		-e '/LDFLAGS/s/=/+=/' Makefile || die "sed failed for Makefile"
+		-e '/LDFLAGS/s/= -s/+=/' Makefile || die "sed failed for Makefile"
 
 	if ! use test ; then
 		sed -i '/TARGETS/s/ethq_test//' Makefile \
@@ -42,15 +39,10 @@ src_configure() {
 	default
 }
 
-src_compile() {
-	# override for ncurses[tinfo]
-	emake CXX="$(tc-getCXX)" LIBS_CURSES="$($(tc-getPKG_CONFIG) --libs ncurses)"
-}
-
 src_test() {
 	local driver
 	for driver in tests/* ; do
-		"${S}"/ethq_test "${driver##*/}" "${driver}" \
+		"${S}"/ethq_test "$(basename "${driver%%-*}")" "${driver}" \
 			|| die "test failed on ${driver}"
 	done
 }