diff --git a/app-admin/syslog-ng/metadata.xml b/app-admin/syslog-ng/metadata.xml
index db015d19593bb..d8462695f089d 100644
--- a/app-admin/syslog-ng/metadata.xml
+++ b/app-admin/syslog-ng/metadata.xml
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>mr_bones_@gentoo.org</email>
-	<name>Michael Sterrett</name>
-</maintainer>
-<use>
-	<flag name='amqp'>Enable support for AMQP destinations</flag>
-	<flag name='smtp'>Enable support for SMTP destinations</flag>
-	<flag name='spoof-source'>Enable support for spoofed source addresses</flag>
-	<flag name='json'>Enable support for JSON template formatting via <pkg>dev-libs/json-c</pkg></flag>
-	<flag name='mongodb'>Enable support for mongodb destinations</flag>
-	<flag name='pacct'>Enable support for reading Process Accounting files (EXPERIMENTAL, Linux only)</flag>
-	<flag name='redis'>Enable support for Redis destinations</flag>
-</use>
+	<maintainer>
+		<email>mr_bones_@gentoo.org</email>
+		<name>Michael Sterrett</name>
+	</maintainer>
+	<use>
+		<flag name="amqp">Enable support for AMQP destinations</flag>
+		<flag name="smtp">Enable support for SMTP destinations</flag>
+		<flag name="spoof-source">Enable support for spoofed source addresses</flag>
+		<flag name="json">Enable support for JSON template formatting via <pkg>dev-libs/json-c</pkg></flag>
+		<flag name="mongodb">Enable support for mongodb destinations</flag>
+		<flag name="pacct">Enable support for reading Process Accounting files (EXPERIMENTAL, Linux only)</flag>
+		<flag name="redis">Enable support for Redis destinations</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">balabit/syslog-ng</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-shells/hstr/metadata.xml b/app-shells/hstr/metadata.xml
index 2ca2823aef5df..ba82c039cddd8 100644
--- a/app-shells/hstr/metadata.xml
+++ b/app-shells/hstr/metadata.xml
@@ -10,4 +10,7 @@
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">dvorka/hstr</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/javassist/metadata.xml b/dev-java/javassist/metadata.xml
index b684b894016c1..84b2638e62315 100644
--- a/dev-java/javassist/metadata.xml
+++ b/dev-java/javassist/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>java</herd>
 	<upstream>
 		<remote-id type="sourceforge">jboss</remote-id>
+		<remote-id type="github">jboss-javassist/javassist</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/distlib/metadata.xml b/dev-python/distlib/metadata.xml
index 73fbb639658e9..4c3ad315180cd 100644
--- a/dev-python/distlib/metadata.xml
+++ b/dev-python/distlib/metadata.xml
@@ -5,5 +5,6 @@
 	<upstream>
 		<remote-id type="pypi">distlib</remote-id>
 		<remote-id type="github">vsajip/distlib</remote-id>
+		<remote-id type="bitbucket">vinay.sajip/distlib</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyamf/metadata.xml b/dev-python/pyamf/metadata.xml
index ee77acb0dc1a8..b190388f8ae2f 100644
--- a/dev-python/pyamf/metadata.xml
+++ b/dev-python/pyamf/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>python</herd>
 	<upstream>
 		<remote-id type="github">hydralabs/pyamf</remote-id>
+		<remote-id type="pypi">PyAMF</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pygit2/metadata.xml b/dev-python/pygit2/metadata.xml
index 42dac9c9129ac..64d2b81ef749a 100644
--- a/dev-python/pygit2/metadata.xml
+++ b/dev-python/pygit2/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="github">libgit2/pygit2</remote-id>
+    <remote-id type="pypi">pygit2</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/stormpath/metadata.xml b/dev-python/stormpath/metadata.xml
index b9aa63f055558..34f02010f2636 100644
--- a/dev-python/stormpath/metadata.xml
+++ b/dev-python/stormpath/metadata.xml
@@ -9,5 +9,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">stormpath/stormpath-sdk-python</remote-id>
+		<remote-id type="pypi">stormpath</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/trollius/metadata.xml b/dev-python/trollius/metadata.xml
index 68aa3af684bc1..321c04a0531f6 100644
--- a/dev-python/trollius/metadata.xml
+++ b/dev-python/trollius/metadata.xml
@@ -5,5 +5,6 @@
   <upstream>
     <remote-id type="pypi">trollius</remote-id>
     <remote-id type="bitbucket">enovance/trollius</remote-id>
+    <remote-id type="github">haypo/trollius</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-util/shflags/metadata.xml b/dev-util/shflags/metadata.xml
index b314e392fd193..d9096ef820927 100644
--- a/dev-util/shflags/metadata.xml
+++ b/dev-util/shflags/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">shflags</remote-id>
+		<remote-id type="github">kward/shflags</remote-id>
 	</upstream>
 </pkgmetadata>