diff --git a/app-antivirus/clamav-unofficial-sigs/metadata.xml b/app-antivirus/clamav-unofficial-sigs/metadata.xml
index 3c2da3db86b66..9f703d6f24d48 100644
--- a/app-antivirus/clamav-unofficial-sigs/metadata.xml
+++ b/app-antivirus/clamav-unofficial-sigs/metadata.xml
@@ -6,5 +6,6 @@
   </maintainer>
   <upstream>
     <remote-id type="sourceforge">unofficial-sigs</remote-id>
+    <remote-id type="github">extremeshok/clamav-unofficial-sigs</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-misc/resolve-march-native/metadata.xml b/app-misc/resolve-march-native/metadata.xml
index 16bcc9f800a20..e6b355324fbea 100644
--- a/app-misc/resolve-march-native/metadata.xml
+++ b/app-misc/resolve-march-native/metadata.xml
@@ -5,4 +5,7 @@
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">hartwork/resolve-march-native</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/CacheControl/metadata.xml b/dev-python/CacheControl/metadata.xml
index b1abf4285d5b5..6e5e1025af5ed 100644
--- a/dev-python/CacheControl/metadata.xml
+++ b/dev-python/CacheControl/metadata.xml
@@ -7,5 +7,6 @@
   </use>
   <upstream>
     <remote-id type="github">ionrock/cachecontrol</remote-id>
+    <remote-id type="pypi">CacheControl</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/distlib/metadata.xml b/dev-python/distlib/metadata.xml
index de483c53568fa..4f091686b286f 100644
--- a/dev-python/distlib/metadata.xml
+++ b/dev-python/distlib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+	<herd>python</herd>
+	<upstream>
+		<remote-id type="pypi">distlib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/packaging/metadata.xml b/dev-python/packaging/metadata.xml
index 301d2207cc291..b3fded60940dd 100644
--- a/dev-python/packaging/metadata.xml
+++ b/dev-python/packaging/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
+	<upstream>
+		<remote-id type="pypi">packaging</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pip/metadata.xml b/dev-python/pip/metadata.xml
index 3181c2c8b4ad1..183e12f9a0727 100644
--- a/dev-python/pip/metadata.xml
+++ b/dev-python/pip/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">pip</remote-id>
+    <remote-id type="github">pypa/pip</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/progress/metadata.xml b/dev-python/progress/metadata.xml
index 301d2207cc291..fb605614164bd 100644
--- a/dev-python/progress/metadata.xml
+++ b/dev-python/progress/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
+	<upstream>
+		<remote-id type="pypi">progress</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/pypolicyd-spf/metadata.xml b/mail-filter/pypolicyd-spf/metadata.xml
index a09f4df7bb3b6..4869ccaf4e15a 100644
--- a/mail-filter/pypolicyd-spf/metadata.xml
+++ b/mail-filter/pypolicyd-spf/metadata.xml
@@ -6,5 +6,6 @@
   </maintainer>
   <upstream>
     <remote-id type="launchpad">pypolicyd-spf</remote-id>
+    <remote-id type="pypi">pypolicyd-spf</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-sound/helm/metadata.xml b/media-sound/helm/metadata.xml
index af0275e2998ac..a6410ec46591b 100644
--- a/media-sound/helm/metadata.xml
+++ b/media-sound/helm/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>proaudio</herd>
+  <upstream>
+    <remote-id type="github">mtytel/helm</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-video/gpac/metadata.xml b/media-video/gpac/metadata.xml
index 57a763019a923..012c2b432c0b6 100644
--- a/media-video/gpac/metadata.xml
+++ b/media-video/gpac/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="sourceforge">gpac</remote-id>
+    <remote-id type="github">gpac/gpac</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-wireless/rfcat/metadata.xml b/net-wireless/rfcat/metadata.xml
index f66711c76dbbc..8b5a020f4c4e3 100644
--- a/net-wireless/rfcat/metadata.xml
+++ b/net-wireless/rfcat/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>zerochaos@gentoo.org</email>
-<name>Rick Farina</name>
-<description>maintainer</description>
-</maintainer>
-<longdescription lang="en">
+	<maintainer>
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+		<description>maintainer</description>
+	</maintainer>
+	<longdescription lang="en">
 </longdescription>
+	<upstream>
+		<remote-id type="bitbucket">atlas0fd00m/rfcat</remote-id>
+	</upstream>
 </pkgmetadata>