diff --git a/x11-terms/tym/Manifest b/x11-terms/tym/Manifest
index 39f847ee32..b2ffdeb74b 100644
--- a/x11-terms/tym/Manifest
+++ b/x11-terms/tym/Manifest
@@ -1 +1 @@
-DIST tym-3.5.1.tar.gz 154615 BLAKE2B 93755c2a1a392e7b9fe12ece595314cf97ae828dd8e6f3af0453f10c7fb5ac4b72a63d30e97d50b23bcffab1712086c1e569437f8bbfe88f31b19594e8acb300 SHA512 c1eb138fd0c0c7a3485528720bdadcac5b8353abf68f81ae8293bc28a3d3951c41fc665a52877f446b000cdd863413fc734ef227b0bdc51c2a7d1fb0c0237639
+DIST tym-3.5.1.tar.gz 46145 BLAKE2B 8a8703d0d258a00f026b317bd4dfab013d9460cd83e549e428e65d7b123fb5b17f630fbca36da214cd2391ada36eedd6ea6d298ce2c83bcc10a4174037bd2428 SHA512 35b0dcc0738cfc73cc2cfd4b3cfc26131184bb78b928e519f48e9e6aff0a9a58636e7a8a1905b2c55f324e893fe5e547918a70657b8c99421b50accc3426a0cc
diff --git a/x11-terms/tym/tym-3.5.1-r1.ebuild b/x11-terms/tym/tym-3.5.1-r2.ebuild
similarity index 69%
rename from x11-terms/tym/tym-3.5.1-r1.ebuild
rename to x11-terms/tym/tym-3.5.1-r2.ebuild
index ba2df003b7..a3660a4931 100644
--- a/x11-terms/tym/tym-3.5.1-r1.ebuild
+++ b/x11-terms/tym/tym-3.5.1-r2.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-3 luajit )
-inherit lua-single xdg
+inherit autotools lua-single xdg
 
 if [[ ${PV} == 9999 ]]; then
-	inherit git-r3 autotools
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/endaaman/tym"
 else
-	SRC_URI="https://github.com/endaaman/tym/releases/download/${PV}/${P}.tar.gz"
+	SRC_URI="https://github.com/endaaman/tym/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -19,6 +19,7 @@ HOMEPAGE="https://github.com/endaaman/tym"
 
 LICENSE="MIT"
 SLOT="0"
+IUSE="test"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
@@ -36,8 +37,6 @@ RDEPEND="${DEPEND}
 
 src_prepare() {
 	default
-	# see https://github.com/endaaman/tym/issues/115
-	sed -i '/^CFLAGS=""/d' "${S}"/configure.ac || die
 
 	# the categories provided by eclass do a better job than upstream, and
 	# having duplicate list of categories fails on QA
@@ -45,8 +44,6 @@ src_prepare() {
 }
 
 src_configure() {
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	fi
-	econf --enable-luajit=$(usex lua_single_target_luajit yes no)
+	eautoreconf
+	econf --enable-luajit=$(usex lua_single_target_luajit yes no) --enable-debug=$(usex test yes no)
 }