diff --git a/dev-python/apptools/metadata.xml b/dev-python/apptools/metadata.xml
index 87c3bbcbfdaef..4c11ab843025f 100644
--- a/dev-python/apptools/metadata.xml
+++ b/dev-python/apptools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>
@@ -8,4 +8,7 @@
     applications. They implement functionality that is commonly needed
     by many applications.
   </longdescription>
+  <upstream>
+    <remote-id type="pypi">apptools</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/enable/metadata.xml b/dev-python/enable/metadata.xml
index 85360f54f0690..de31ed9814dd1 100644
--- a/dev-python/enable/metadata.xml
+++ b/dev-python/enable/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>
@@ -11,5 +11,6 @@
   </longdescription>
   <upstream>
     <remote-id type="github">enthought/enable</remote-id>
+    <remote-id type="pypi">enable</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pykwalify/metadata.xml b/dev-python/pykwalify/metadata.xml
index ab27ad88a27fb..e29a9b67be406 100644
--- a/dev-python/pykwalify/metadata.xml
+++ b/dev-python/pykwalify/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">Grokzen/pykwalify</remote-id>
+		<remote-id type="pypi">pykwalify</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-gnupg/metadata.xml b/dev-python/python-gnupg/metadata.xml
index 0b22cf585fa7c..5f73a6483a19e 100644
--- a/dev-python/python-gnupg/metadata.xml
+++ b/dev-python/python-gnupg/metadata.xml
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>
   <upstream>
     <remote-id type="google-code">python-gnupg</remote-id>
     <remote-id type="github">vsajip/python-gnupg</remote-id>
+    <remote-id type="pypi">python-gnupg</remote-id>
   </upstream>
 </pkgmetadata>