diff --git a/dev-util/fontmake/fontmake-2.4.0.ebuild b/dev-util/fontmake/fontmake-2.4.0.ebuild
index 94e6b53917..a16e48a191 100644
--- a/dev-util/fontmake/fontmake-2.4.0.ebuild
+++ b/dev-util/fontmake/fontmake-2.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-util/fontmake/metadata.xml b/dev-util/fontmake/metadata.xml
index 6f49eba8f4..2283d33631 100644
--- a/dev-util/fontmake/metadata.xml
+++ b/dev-util/fontmake/metadata.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+    <!-- maintainer-needed -->
+    <upstream>
+        <bugs-to>https://github.com/googlefonts/fontmake/issues</bugs-to>
+        <remote-id type="github">googlefonts/fontmake</remote-id>
+        <remote-id type="pypi">fontmake</remote-id>
+    </upstream>
 </pkgmetadata>