diff --git a/dev-python/netaddr/metadata.xml b/dev-python/netaddr/metadata.xml
index 48f423e837e66..ab8d2fb83b0a5 100644
--- a/dev-python/netaddr/metadata.xml
+++ b/dev-python/netaddr/metadata.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>maksbotan@gentoo.org</email>
-    <name>Maxim Koltsov</name>
-  </maintainer>
-  <use>
-    <flag name="cli">Enable netaddr shell with <pkg>dev-python/ipython</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="pypi">netaddr</remote-id>
-    <remote-id type="github">drkjam/netaddr</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="cli">Enable netaddr shell with <pkg>dev-python/ipython</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">netaddr</remote-id>
+		<remote-id type="github">drkjam/netaddr</remote-id>
+		<bugs-to>https://github.com/netaddr/netaddr/issues</bugs-to>
+		<changelog>https://github.com/netaddr/netaddr/blob/master/CHANGELOG</changelog>
+		<doc>https://netaddr.readthedocs.io/</doc>
+	</upstream>
 </pkgmetadata>