diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.22.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.22-r1.ebuild
similarity index 93%
rename from dev-util/rosinstall_generator/rosinstall_generator-0.1.22.ebuild
rename to dev-util/rosinstall_generator/rosinstall_generator-0.1.22-r1.ebuild
index 58ee6bf23a0dc..3b70d500c3cf1 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.22.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-0.1.22-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
index 58ee6bf23a0dc..3b70d500c3cf1 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then