diff --git a/dev-python/baron/Manifest b/dev-python/baron/Manifest
index 1ca7a27b6f..78c5b0c338 100644
--- a/dev-python/baron/Manifest
+++ b/dev-python/baron/Manifest
@@ -1 +1 @@
-DIST baron-0.9.tar.gz 835127 BLAKE2B be5aee3b5f7d8c317295cb88429eb2feb45c2fba135ba1a57370a070bd27dd6ee1fea8048201f40d7579bea56c535855a8605d6304f1987f4b138ed5591d0b77 SHA512 ed31bad1442b8d868ab9872f057db31ad8730654a7e8d49119c75d5631c881b074baf5754b0b0b5023dad62eda1f40461e4445321695248cfa3530b608d48c8e
+DIST baron-0.9.gh.tar.gz 835127 BLAKE2B be5aee3b5f7d8c317295cb88429eb2feb45c2fba135ba1a57370a070bd27dd6ee1fea8048201f40d7579bea56c535855a8605d6304f1987f4b138ed5591d0b77 SHA512 ed31bad1442b8d868ab9872f057db31ad8730654a7e8d49119c75d5631c881b074baf5754b0b0b5023dad62eda1f40461e4445321695248cfa3530b608d48c8e
diff --git a/dev-python/baron/baron-0.9.ebuild b/dev-python/baron/baron-0.9.ebuild
index 461a9f3a35..e1536adbe4 100644
--- a/dev-python/baron/baron-0.9.ebuild
+++ b/dev-python/baron/baron-0.9.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="Full Syntax Tree for python to make writing refactoring code a realist task"
 HOMEPAGE="https://github.com/PyCQA/baron https://baron.pycqa.org"
-SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
@@ -20,6 +20,7 @@ RDEPEND="
 "
 
 distutils_enable_tests pytest
+
 # Doc building fails:
 # RuntimeError: Non Expected warning in `/var/tmp/portage/dev-python/baron-0.9/work/baron-0.9/docs/advanced.rst` line 48
 #distutils_enable_sphinx docs dev-python/matplotlib dev-python/ipython