diff --git a/dev-python/pyglm/Manifest b/dev-python/pyglm/Manifest
index fe84358..e657ba0 100644
--- a/dev-python/pyglm/Manifest
+++ b/dev-python/pyglm/Manifest
@@ -3,5 +3,5 @@ DIST pyglm-2.5.4.tar.gz 931009 BLAKE2B 3c7103e95a389c37087e4c321b84dd45528e3b26a
 DIST pyglm-2.5.7.tar.gz 684032 BLAKE2B e13d7e79f9c1c682e2a4d06f5a9cde33895e70d962585368b20dd3e9c06649bcb1af4c9b71c4585c2bf2ac3b5b0fc66c3743a1cdd238fcd5924d915c0aaa53b9 SHA512 2686466b8430d6323f49b6ed6bfd3caa439ce5b3bcfeb27a916ce48ce7eb445d9e9ca35c3deac866d6096114a9a273eb36e8d75d27fd350ea65634af72f9d9a2
 EBUILD pyglm-2.5.4.ebuild 606 BLAKE2B cf5c53fda97fea1d4bd1ef8e78717c046027ef70f774d40784636d4d7a16c548ee45e7a268ef00504960fecbcc025621bcb9c106c9378b73325e6b604f4badba SHA512 41c6427c05162169357fb91d5c0ef32b273ff3e5ba61e6d3a04666422620b9829b681364684331cfc93bfbe719129318a0ce81ebb38119344b12c750500847ef
 EBUILD pyglm-2.5.7.ebuild 1017 BLAKE2B a3e016ab2f39074d71932b63ddd61c6ff57c86cf722fc551305f1d3600e2597cae6bb21fd139a70a317a2bf7b9a2e5b1d8046fc4bfa22349cbc24270c3e09cbb SHA512 4953a8934ac842cf4ac8c87c9e7d45df18e6e6a4fa3c16397fda0121ea84d57b9c7abfb24587b18157aa2a3bd56e5da08f62d7afb01eebc9e016cefe9019285b
-EBUILD pyglm-9999.ebuild 1017 BLAKE2B a3e016ab2f39074d71932b63ddd61c6ff57c86cf722fc551305f1d3600e2597cae6bb21fd139a70a317a2bf7b9a2e5b1d8046fc4bfa22349cbc24270c3e09cbb SHA512 4953a8934ac842cf4ac8c87c9e7d45df18e6e6a4fa3c16397fda0121ea84d57b9c7abfb24587b18157aa2a3bd56e5da08f62d7afb01eebc9e016cefe9019285b
+EBUILD pyglm-9999.ebuild 1253 BLAKE2B 34422f6cdf19aa815757ff4ffd5f4e0eaebd34ecdb6921c06c76278e0a30b114a8051682ee607cbd552f2cb44eb6a3b199ee714d72cdaf7d6f58ca202ed28611 SHA512 555d68a9eb84c3e5ac5081a1d7a810c7c34123e0a9884a37573f78bda8647bcce4f865763eca7c8e7bf85cffef68f59cc6332e8011c0ba2d789e56925a1e4a13
 MISC metadata.xml 364 BLAKE2B 9ab5f56e676a23a247749b9c567c7ecceee918a184fed4a67771f99260d78b76c10f13f86f3ddb13e590e4fdd59a05b01287878388437eee34627d8be70715a2 SHA512 7175512d947dd6cac2262b883fe5455202c6f3e47ce61e9f6d4bbe5789c24c32275a53f2e8ed64b53a93423abfb697e4166b5221c6570e2a67f5384dc0091a55
diff --git a/dev-python/pyglm/pyglm-9999.ebuild b/dev-python/pyglm/pyglm-9999.ebuild
index e34eab3..ec8e256 100644
--- a/dev-python/pyglm/pyglm-9999.ebuild
+++ b/dev-python/pyglm/pyglm-9999.ebuild
@@ -1,23 +1,25 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{5..10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{5..11} )
 
 inherit distutils-r1
 
 GLM_COMMIT="fcda03b54596adda543bcdccc6c1879e380c86a7"
+TYPING_COMMIT="f47636b86d07d4f91692235e8dfe0af1bd22e883"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Zuzu-Typ/PyGLM.git"
-	EGIT_SUBMODULES=( glm )
+	EGIT_SUBMODULES=( glm pyglm-typing )
 else
 	SRC_URI="
 		https://github.com/Zuzu-Typ/PyGLM/archive/${PV}.tar.gz -> ${P}.tar.gz
 		https://github.com/g-truc/glm/archive/${GLM_COMMIT}.tar.gz -> glm-${GLM_COMMIT}.tar.gz
+		https://github.com/esoma/pyglm-typing/archive/${TYPING_COMMIT}.tar.gz -> pyglm-typing-${TYPING_COMMIT}.tar.gz
 	"
 	KEYWORDS="~amd64"
 	MY_PN="PyGLM"
@@ -34,12 +36,13 @@ RDEPEND=""
 BDEPEND="media-libs/glm"
 
 src_unpack() {
-	# Unvendor GLM once the version is bumped past 0.9.9.8
 	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
 	else
 		default
 		rm -rf "${S}/glm" || die
 		mv "${WORKDIR}/glm-${GLM_COMMIT}" "${S}/glm" || die
+		rm -rf "${S}/pyglm-typing" || die
+		mv "${WORKDIR}/pyglm-typing-${TYPING_COMMIT}" "${S}/pyglm-typing" || die
 	fi
 }