diff --git a/sys-devel/gef/Manifest b/sys-devel/gef/Manifest
index 3d0d3d8e4..24780b7d2 100644
--- a/sys-devel/gef/Manifest
+++ b/sys-devel/gef/Manifest
@@ -1,2 +1,2 @@
-DIST gef-2020.06.tar.gz 145743 BLAKE2B 9c4bcf5a4ffa864027659bc1a2d93c9eafac09a3c1c45b60c86531a5a4b139f2d0712f4a76e55380135c93bf4a0d154b91d6668a926a8779c469690843b21410 SHA512 6cfe7ff60f487e1ebb6e47820d90198a4cdbfe04fd412a2595a293bdc064d2871ee897cf2aba46300fc0b481493288e9b72ea3815488f5aaa4012b1c0613be07
 DIST gef-2021.01.tar.gz 150718 BLAKE2B 31fd1182d56f39c2e6facf6660ea1a7dee41d7eabf0cff4a11751121465358af520d3cffc664ad78bae6b8d0766e21ce0184a20456971a88b1d34520a7a31510 SHA512 5586fdbe8a77326db8fa256738f995343c32a5ef1158c0c7729fdccbb4681d93659bc693fc097ca5875744fb6df4da641f427a48c1c02e70efafa69c789f8e93
+DIST gef-2021.04.tar.gz 150569 BLAKE2B 58fc729eee5b5726bd0500a88eb7a2392723a7fa59eaa3df04075baccd9eb6e057b58ed3c8bec58788ab7f0f31b7fed899a2c412a90e813be28acd93a8191265 SHA512 609d881db9053f5fdbb5d67ff61e828a7d96df38bf93eacc3feeafb6bd29b038c687e2e51ae2d858333e94fc3118872dc6da967cedb3d28308a96a48cc655f52
diff --git a/sys-devel/gef/gef-2020.06.ebuild b/sys-devel/gef/gef-2021.04.ebuild
similarity index 100%
rename from sys-devel/gef/gef-2020.06.ebuild
rename to sys-devel/gef/gef-2021.04.ebuild
diff --git a/sys-devel/gef/gef-9999.ebuild b/sys-devel/gef/gef-9999.ebuild
index 0320b36dc..194578721 100644
--- a/sys-devel/gef/gef-9999.ebuild
+++ b/sys-devel/gef/gef-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+#dev-libs/keystone does not support python3.9 yet
+PYTHON_COMPAT=( python3_{7..8} )
 
 inherit eutils python-single-r1
 
@@ -15,6 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/hugsy/gef"
 else
 	SRC_URI="https://github.com/hugsy/gef/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	#dev-libs/capstone is not stable yet
 	KEYWORDS="~amd64 ~x86"
 fi