ADd missing remote-id entries

Signed-off-by: Justin Lecher <jlec@gentoo.org>

145 files changed, 373 insertions, 106 deletions

diff --git a/app-admin/lsyncd/metadata.xml b/app-admin/lsyncd/metadata.xml
index 926da28a904a..8716f562d13a 100644
--- a/app-admin/lsyncd/metadata.xml
+++ b/app-admin/lsyncd/metadata.xml
@@ -6,5 +6,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">lsyncd</remote-id>
+		<remote-id type="github">axkibe/lsyncd</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-arch/lz4/metadata.xml b/app-arch/lz4/metadata.xml
index 1decb7dd7609..a69854a96fb1 100644
--- a/app-arch/lz4/metadata.xml
+++ b/app-arch/lz4/metadata.xml
@@ -5,7 +5,10 @@
 		<email>ryao@gentoo.org</email>
 		<name>Richard Yao</name>
 	</maintainer>
-<use>
-<flag name='valgrind'>Enable usage of dev-util/valgrind in tests</flag>
-</use>
+	<use>
+		<flag name="valgrind">Enable usage of dev-util/valgrind in tests</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">Cyan4973/lz4</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-benchmarks/httperf/metadata.xml b/app-benchmarks/httperf/metadata.xml
index 870f412e6dea..82d59e7109d1 100644
--- a/app-benchmarks/httperf/metadata.xml
+++ b/app-benchmarks/httperf/metadata.xml
@@ -14,5 +14,6 @@
 		measurements.</longdescription>
 	<upstream>
 		<remote-id type="google-code">httperf</remote-id>
+		<remote-id type="github">httperf/httperf</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-emacs/google-c-style/metadata.xml b/app-emacs/google-c-style/metadata.xml
index 1d4cd56fb85b..f662d74d64b6 100644
--- a/app-emacs/google-c-style/metadata.xml
+++ b/app-emacs/google-c-style/metadata.xml
@@ -3,4 +3,7 @@
 <pkgmetadata>
 	<herd>chromium</herd>
 	<herd>emacs</herd>
+	<upstream>
+		<remote-id type="github">google/styleguide</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-emacs/yasnippet/metadata.xml b/app-emacs/yasnippet/metadata.xml
index 6d71c2e5287f..be75e8ba45aa 100644
--- a/app-emacs/yasnippet/metadata.xml
+++ b/app-emacs/yasnippet/metadata.xml
@@ -6,5 +6,6 @@
   and more powerful than smart-snippet.</longdescription>
 	<upstream>
 		<remote-id type="google-code">yasnippet</remote-id>
+		<remote-id type="github">capitaomorte/yasnippet</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-emulation/rkt/metadata.xml b/app-emulation/rkt/metadata.xml
index d01e2b47e81a..1100d241c8ff 100644
--- a/app-emulation/rkt/metadata.xml
+++ b/app-emulation/rkt/metadata.xml
@@ -4,7 +4,7 @@
 	<maintainer>
 		<email>mail@stefanjunker.de</email>
 		<name>Stefan Junker</name>
-	</maintainer>	
+	</maintainer>
 	<maintainer>
 		<email>alunduil@gentoo.org</email>
 		<name>Alex Brandt</name>
@@ -21,4 +21,7 @@
 		<flag name="rkt_stage1_src">Build the stage1.aci from source</flag>
 		<flag name="rkt_stage1_host">Assemble stage1.aci from host binaries</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">coreos/rkt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-forensics/libbfio/metadata.xml b/app-forensics/libbfio/metadata.xml
index af67b19a8a02..dd92a9b27328 100644
--- a/app-forensics/libbfio/metadata.xml
+++ b/app-forensics/libbfio/metadata.xml
@@ -1,9 +1,11 @@
 <?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>
-</maintainer>
+	<maintainer>
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">libyal/libbfio</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/app-forensics/libewf/metadata.xml b/app-forensics/libewf/metadata.xml
index 8c8acdb43b78..dc79c997112f 100644
--- a/app-forensics/libewf/metadata.xml
+++ b/app-forensics/libewf/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>forensics</herd>
-<use>
-	<flag name="bfio">Enables libbfio for chaining file in file handling</flag>
-	<flag name="rawio">Enables raw IO handling</flag>
-	<flag name="ewf">Enables the v1 API</flag>
-	<flag name="fuse">Enable fuse support for ewfmount</flag>
-	<flag name="uuid">Enable UUID support in the ewftools</flag>
-</use>
+	<herd>forensics</herd>
+	<use>
+		<flag name="bfio">Enables libbfio for chaining file in file handling</flag>
+		<flag name="rawio">Enables raw IO handling</flag>
+		<flag name="ewf">Enables the v1 API</flag>
+		<flag name="fuse">Enable fuse support for ewfmount</flag>
+		<flag name="uuid">Enable UUID support in the ewftools</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">libyal/libewf</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-anthy/metadata.xml b/app-i18n/ibus-anthy/metadata.xml
index 96a29926bf06..6b2f60169a00 100644
--- a/app-i18n/ibus-anthy/metadata.xml
+++ b/app-i18n/ibus-anthy/metadata.xml
@@ -6,6 +6,7 @@
 libanthy.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
+		<remote-id type="github">ibus/ibus</remote-id>
 	</upstream>
 	<use>
 		<flag name="deprecated">Install deprecated pygtk2 library</flag>
diff --git a/app-i18n/ibus-chewing/metadata.xml b/app-i18n/ibus-chewing/metadata.xml
index 7d84776d4dff..57657ad7a713 100644
--- a/app-i18n/ibus-chewing/metadata.xml
+++ b/app-i18n/ibus-chewing/metadata.xml
@@ -5,5 +5,6 @@
 	<longdescription lang="en">The Chewing engine for IBus platform. It provides Chinese input method from libchewing.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
+		<remote-id type="github">ibus/ibus</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-hangul/metadata.xml b/app-i18n/ibus-hangul/metadata.xml
index 299a127ff9b1..cfe537c73219 100644
--- a/app-i18n/ibus-hangul/metadata.xml
+++ b/app-i18n/ibus-hangul/metadata.xml
@@ -5,5 +5,6 @@
 	<longdescription lang="en">The Hangul engine for IBus platform. It provides Korean input method from libhangul.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
+		<remote-id type="github">ibus/ibus</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-m17n/metadata.xml b/app-i18n/ibus-m17n/metadata.xml
index 09339d3d5744..a1663ffedc99 100644
--- a/app-i18n/ibus-m17n/metadata.xml
+++ b/app-i18n/ibus-m17n/metadata.xml
@@ -8,9 +8,10 @@
   </longdescription>
   <upstream>
     <remote-id type="cpe">cpe:/a:ibus_project:ibus-m17n</remote-id>
+    <remote-id type="github">ibus/ibus</remote-id>
   </upstream>
   <use>
-    <flag name='gtk'>
+    <flag name="gtk">
       Build the preference interfaces, based on
       <pkg>x11-libs/gtk+</pkg> (GTK+ 2).
     </flag>
diff --git a/app-i18n/ibus-pinyin/metadata.xml b/app-i18n/ibus-pinyin/metadata.xml
index e48d0a4aca00..da4f439af94c 100644
--- a/app-i18n/ibus-pinyin/metadata.xml
+++ b/app-i18n/ibus-pinyin/metadata.xml
@@ -6,12 +6,14 @@
     <email>dlan@gentoo.org</email>
     <name>Yixun Lan</name>
   </maintainer>
-<longdescription lang="en">
+  <longdescription lang="en">
 PinYin engine for IBus platform. It provides a Chinese PinYin input method.
 </longdescription>
-<use>
-  <flag name="boost">Compile against <pkg>dev-libs/boost</pkg> libraries</flag>
-  <flag name="opencc">Enable support for <pkg>app-i18n/opencc</pkg></flag>
-</use>
+  <use>
+    <flag name="boost">Compile against <pkg>dev-libs/boost</pkg> libraries</flag>
+    <flag name="opencc">Enable support for <pkg>app-i18n/opencc</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="github">ibus/ibus</remote-id>
+  </upstream>
 </pkgmetadata>
-
diff --git a/app-i18n/ibus-table-code/metadata.xml b/app-i18n/ibus-table-code/metadata.xml
index e81802ffe5c5..7995586c1fcb 100644
--- a/app-i18n/ibus-table-code/metadata.xml
+++ b/app-i18n/ibus-table-code/metadata.xml
@@ -5,5 +5,6 @@
 	<longdescription lang="en">The package contains additional tables for Ibus-Table.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
+		<remote-id type="github">ibus/ibus</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-table-cyrillic/metadata.xml b/app-i18n/ibus-table-cyrillic/metadata.xml
index b260e7d8963a..c14f190bf59d 100644
--- a/app-i18n/ibus-table-cyrillic/metadata.xml
+++ b/app-i18n/ibus-table-cyrillic/metadata.xml
@@ -5,5 +5,6 @@
 	<longdescription lang="en">ibus-table-cyrillic provides Transit, Russian Traditional, Yawerty input method on IBus-Table on IBus framework.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
+		<remote-id type="github">ibus/ibus</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-table-extraphrase/metadata.xml b/app-i18n/ibus-table-extraphrase/metadata.xml
index 7c97bd6353d3..3dccf2765c10 100644
--- a/app-i18n/ibus-table-extraphrase/metadata.xml
+++ b/app-i18n/ibus-table-extraphrase/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>cjk</herd>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
+		<remote-id type="github">ibus/ibus</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-table-latin/metadata.xml b/app-i18n/ibus-table-latin/metadata.xml
index 875d1031b779..d28bbfa34c71 100644
--- a/app-i18n/ibus-table-latin/metadata.xml
+++ b/app-i18n/ibus-table-latin/metadata.xml
@@ -5,5 +5,6 @@
 	<longdescription lang="en">The Latin tables for Ibus-Table.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
+		<remote-id type="github">ibus/ibus</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-table-tv/metadata.xml b/app-i18n/ibus-table-tv/metadata.xml
index db59448265e5..9cba36082eda 100644
--- a/app-i18n/ibus-table-tv/metadata.xml
+++ b/app-i18n/ibus-table-tv/metadata.xml
@@ -5,5 +5,6 @@
 	<longdescription lang="en">The Thai and Viqr (Vietnamese) tables for Ibus-Table.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
+		<remote-id type="github">ibus/ibus</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-table/metadata.xml b/app-i18n/ibus-table/metadata.xml
index 46e3a1d32673..be7a0b838864 100644
--- a/app-i18n/ibus-table/metadata.xml
+++ b/app-i18n/ibus-table/metadata.xml
@@ -5,5 +5,6 @@
 	<longdescription lang="en">The package contains general Table engine for IBus platform.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
+		<remote-id type="github">ibus/ibus</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/mozc/metadata.xml b/app-i18n/mozc/metadata.xml
index 61a84a9b2f9c..6f9e8961bd0a 100644
--- a/app-i18n/mozc/metadata.xml
+++ b/app-i18n/mozc/metadata.xml
@@ -12,5 +12,6 @@ Mozc is a Japanese Input Method Editor (IME) designed for multi-platform such as
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">jsoncpp</remote-id>
+		<remote-id type="github">google/mozc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/opencc/metadata.xml b/app-i18n/opencc/metadata.xml
index e60b8b7f6efa..75a9129447b3 100644
--- a/app-i18n/opencc/metadata.xml
+++ b/app-i18n/opencc/metadata.xml
@@ -6,5 +6,6 @@
 Traditional Chinese and Simplified Chinese.</longdescription>
 	<upstream>
 		<remote-id type="google-code">open-chinese-convert</remote-id>
+		<remote-id type="github">BYVoid/OpenCC</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/uim/metadata.xml b/app-i18n/uim/metadata.xml
index dcb569955398..43ecf63bb11a 100644
--- a/app-i18n/uim/metadata.xml
+++ b/app-i18n/uim/metadata.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
-<longdescription lang="en">
+  <herd>cjk</herd>
+  <longdescription lang="en">
   uim is a simple, secure and flexible input method library.  At the moment
   Anthy, SKK, Prime, T-code, TUT-code (these are Japanese input method),
   Pinyin (Chinese input method), Hangul (Korean input method), IPA
   (International Phonetic Alphabet) are implemented.  You can extend the
   library with Scheme thus easily, or with C if it becomes rather complicated.
 </longdescription>
-<use>
-  <flag name='anthy'>Enable support for <pkg>app-i18n/anthy</pkg> input method
+  <use>
+    <flag name="anthy">Enable support for <pkg>app-i18n/anthy</pkg> input method
     </flag>
-  <flag name='eb'>Enable support for <pkg>dev-libs/eb</pkg></flag>
-  <flag name='gtk3'>Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
-  <flag name='skk'>Enable support for <pkg>app-i18n/skk-jisyo</pkg></flag>
-</use>
+    <flag name="eb">Enable support for <pkg>dev-libs/eb</pkg></flag>
+    <flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
+    <flag name="skk">Enable support for <pkg>app-i18n/skk-jisyo</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="github">uim/uim</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/epubcheck/metadata.xml b/app-text/epubcheck/metadata.xml
index 63ac5653603a..fc4e4eb003bf 100644
--- a/app-text/epubcheck/metadata.xml
+++ b/app-text/epubcheck/metadata.xml
@@ -4,4 +4,7 @@
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">IDPF/epubcheck</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/logmerge/metadata.xml b/app-text/logmerge/metadata.xml
index b0a9ab94866d..d5d6737cf207 100644
--- a/app-text/logmerge/metadata.xml
+++ b/app-text/logmerge/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,4 +7,7 @@
   <longdescription>
     Merge multiple logs such that multilined entries appear in chronological order without breaks.
   </longdescription>
+  <upstream>
+    <remote-id type="github">ildar-shaimordanov/logmerge</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/zemberek-server/metadata.xml b/app-text/zemberek-server/metadata.xml
index d75afba941ef..1484b932b98d 100644
--- a/app-text/zemberek-server/metadata.xml
+++ b/app-text/zemberek-server/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>java</herd>
 	<upstream>
 		<remote-id type="google-code">zemberek</remote-id>
+		<remote-id type="github">ahmetaa/zemberek-nlp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-cpp/ctemplate/metadata.xml b/dev-cpp/ctemplate/metadata.xml
index e3f7acbf8e43..2b4f08135671 100644
--- a/dev-cpp/ctemplate/metadata.xml
+++ b/dev-cpp/ctemplate/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>cpp</herd>
 	<upstream>
 		<remote-id type="google-code">google-ctemplate</remote-id>
+		<remote-id type="github">olafvdspek/ctemplate</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-cpp/glog/metadata.xml b/dev-cpp/glog/metadata.xml
index f53753845dcf..fcf6c17cbcb3 100644
--- a/dev-cpp/glog/metadata.xml
+++ b/dev-cpp/glog/metadata.xml
@@ -11,5 +11,6 @@
 	</use>
 	<upstream>
 		<remote-id type="google-code">google-glog</remote-id>
+		<remote-id type="github">google/glog</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-cpp/gmock/metadata.xml b/dev-cpp/gmock/metadata.xml
index 541e716613f3..6f168ee9907f 100644
--- a/dev-cpp/gmock/metadata.xml
+++ b/dev-cpp/gmock/metadata.xml
@@ -6,5 +6,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">googlemock</remote-id>
+		<remote-id type="github">google/googlemock</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-cpp/gtest/metadata.xml b/dev-cpp/gtest/metadata.xml
index 69c1537c80d2..130be1dacd75 100644
--- a/dev-cpp/gtest/metadata.xml
+++ b/dev-cpp/gtest/metadata.xml
@@ -2,11 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-	<email>tomka@gentoo.org</email>
-	<name>Thomas Kahle</name>
+		<email>tomka@gentoo.org</email>
+		<name>Thomas Kahle</name>
 	</maintainer>
 	<upstream>
 		<doc lang="en">https://code.google.com/p/googletest/w/list</doc>
 		<remote-id type="google-code">googletest</remote-id>
+		<remote-id type="github">google/googletest</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-cpp/sparsehash/metadata.xml b/dev-cpp/sparsehash/metadata.xml
index a4f851005953..3a6027d20c2a 100644
--- a/dev-cpp/sparsehash/metadata.xml
+++ b/dev-cpp/sparsehash/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>cpp</herd>
 	<upstream>
 		<remote-id type="google-code">google-sparsehash</remote-id>
+		<remote-id type="github">google/sparsehash</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-cpp/yaml-cpp/metadata.xml b/dev-cpp/yaml-cpp/metadata.xml
index 40068b39f78f..03c0c12b8a94 100644
--- a/dev-cpp/yaml-cpp/metadata.xml
+++ b/dev-cpp/yaml-cpp/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">yaml-cpp</remote-id>
+		<remote-id type="github">jbeder/yaml-cpp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-db/innotop/metadata.xml b/dev-db/innotop/metadata.xml
index 44b249080ca5..667f2932477e 100644
--- a/dev-db/innotop/metadata.xml
+++ b/dev-db/innotop/metadata.xml
@@ -6,5 +6,6 @@
 but with many more features</longdescription>
 	<upstream>
 		<remote-id type="google-code">innotop</remote-id>
+		<remote-id type="github">innotop/innotop</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/boilerpipe/metadata.xml b/dev-java/boilerpipe/metadata.xml
index 4128863055b4..e94379cf02b3 100644
--- a/dev-java/boilerpipe/metadata.xml
+++ b/dev-java/boilerpipe/metadata.xml
@@ -5,5 +5,7 @@
 		<email>ercpe@gentoo.org</email>
 		<name>Johann Schmitz (ercpe)</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">kohlschutter/boilerpipe</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/gson/metadata.xml b/dev-java/gson/metadata.xml
index cb549ed01713..f384ea9a98d2 100644
--- a/dev-java/gson/metadata.xml
+++ b/dev-java/gson/metadata.xml
@@ -3,4 +3,7 @@
 <pkgmetadata>
 	<herd>java</herd>
 	<longdescription>Gson is a Java library that can be used to convert Java Objects into their JSON representation. It can also be used to convert a JSON string to an equivalent Java object. Gson can work with arbitrary Java objects including pre-existing objects that you do not have source-code of.</longdescription>
+	<upstream>
+		<remote-id type="github">google/gson</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/hamcrest-core/metadata.xml b/dev-java/hamcrest-core/metadata.xml
index 3157d41caefc..1676f06714ee 100644
--- a/dev-java/hamcrest-core/metadata.xml
+++ b/dev-java/hamcrest-core/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>java</herd>
 	<upstream>
 		<remote-id type="google-code">hamcrest</remote-id>
+		<remote-id type="github">hamcrest/</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/hamcrest-generator/metadata.xml b/dev-java/hamcrest-generator/metadata.xml
index 3157d41caefc..1676f06714ee 100644
--- a/dev-java/hamcrest-generator/metadata.xml
+++ b/dev-java/hamcrest-generator/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>java</herd>
 	<upstream>
 		<remote-id type="google-code">hamcrest</remote-id>
+		<remote-id type="github">hamcrest/</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/hamcrest-integration/metadata.xml b/dev-java/hamcrest-integration/metadata.xml
index 604e0a4238bb..fe6095912db3 100644
--- a/dev-java/hamcrest-integration/metadata.xml
+++ b/dev-java/hamcrest-integration/metadata.xml
@@ -2,5 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="github">hamcrest/</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/hamcrest-library/metadata.xml b/dev-java/hamcrest-library/metadata.xml
index 314c8dd8ca46..1676f06714ee 100644
--- a/dev-java/hamcrest-library/metadata.xml
+++ b/dev-java/hamcrest-library/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>java</herd>
 	<upstream>
 		<remote-id type="google-code">hamcrest</remote-id>
+		<remote-id type="github">hamcrest/</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/java-apicheck/metadata.xml b/dev-java/java-apicheck/metadata.xml
index 7303cef96964..0715bc757941 100644
--- a/dev-java/java-apicheck/metadata.xml
+++ b/dev-java/java-apicheck/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="github">gentoo/java-apicheck</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/java-xmlbuilder/metadata.xml b/dev-java/java-xmlbuilder/metadata.xml
index 7303cef96964..99c17d026dce 100644
--- a/dev-java/java-xmlbuilder/metadata.xml
+++ b/dev-java/java-xmlbuilder/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="github">jmurty/java-xmlbuilder</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jvyamlb/metadata.xml b/dev-java/jvyamlb/metadata.xml
index 46ab2b1323bf..76c4f7b31ad5 100644
--- a/dev-java/jvyamlb/metadata.xml
+++ b/dev-java/jvyamlb/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">jvyamlb</remote-id>
+		<remote-id type="github">olabini/jvyamlb</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/kryo/metadata.xml b/dev-java/kryo/metadata.xml
index 2d2ccc0795d8..649088ab7d53 100644
--- a/dev-java/kryo/metadata.xml
+++ b/dev-java/kryo/metadata.xml
@@ -7,7 +7,9 @@
 	The goals of the project are speed, efficiency, and an easy to use API. The project
 	is useful any time objects need to be persisted, whether to a file, database, or over
 	the network. Kryo can also perform automatic deep and shallow copying/cloning. This is direct copying
-	from object to object, not object->bytes->object.
+	from object to object, not object-&gt;bytes-&gt;object.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">EsotericSoftware/kryo</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/matrix-toolkits-java/metadata.xml b/dev-java/matrix-toolkits-java/metadata.xml
index 1c59ceec112f..3316a10f58a2 100644
--- a/dev-java/matrix-toolkits-java/metadata.xml
+++ b/dev-java/matrix-toolkits-java/metadata.xml
@@ -4,5 +4,6 @@
   <herd>java</herd>
   <upstream>
     <remote-id type="google-code">matrix-toolkits-java</remote-id>
+    <remote-id type="github">fommil/matrix-toolkits-java</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-java/mchange-commons/metadata.xml b/dev-java/mchange-commons/metadata.xml
index 250f2d1940ea..885373c1666a 100644
--- a/dev-java/mchange-commons/metadata.xml
+++ b/dev-java/mchange-commons/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>java</herd>
+  <upstream>
+    <remote-id type="github">swaldman/mchange-commons-java</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-java/reflections/metadata.xml b/dev-java/reflections/metadata.xml
index 909a9b33f6fd..4e7ae7699d82 100644
--- a/dev-java/reflections/metadata.xml
+++ b/dev-java/reflections/metadata.xml
@@ -3,4 +3,7 @@
 <pkgmetadata>
 	<herd>java</herd>
 	<longdescription>Reflections scans your classpath, indexes the metadata, allows you to query it on runtime and may save and collect that information for many modules within your project.</longdescription>
+	<upstream>
+		<remote-id type="github">ronmamo/reflections</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/snakeyaml/metadata.xml b/dev-java/snakeyaml/metadata.xml
index 8c290ebcf0ab..a37d95efc2a6 100644
--- a/dev-java/snakeyaml/metadata.xml
+++ b/dev-java/snakeyaml/metadata.xml
@@ -6,5 +6,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="google-code">snakeyaml</remote-id>
+		<remote-id type="bitbucket">asomov/snakeyaml</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/typesafe-config/metadata.xml b/dev-java/typesafe-config/metadata.xml
index 250f2d1940ea..09402e6456b2 100644
--- a/dev-java/typesafe-config/metadata.xml
+++ b/dev-java/typesafe-config/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>java</herd>
+  <upstream>
+    <remote-id type="github">typesafehub/config</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-java/zemberek/metadata.xml b/dev-java/zemberek/metadata.xml
index 755a350e8c7f..808a4a60d64c 100644
--- a/dev-java/zemberek/metadata.xml
+++ b/dev-java/zemberek/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">zemberek</remote-id>
+		<remote-id type="github">ahmetaa/zemberek-nlp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/cityhash/metadata.xml b/dev-libs/cityhash/metadata.xml
index 24cbb90cf0c4..18d1743c437e 100644
--- a/dev-libs/cityhash/metadata.xml
+++ b/dev-libs/cityhash/metadata.xml
@@ -5,4 +5,7 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">google/cityhash</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/double-conversion/metadata.xml b/dev-libs/double-conversion/metadata.xml
index e74139346bfc..6b4f010d7c4a 100644
--- a/dev-libs/double-conversion/metadata.xml
+++ b/dev-libs/double-conversion/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang='en'>
+  <herd>sci</herd>
+  <longdescription lang="en">
   This library consists of efficient conversion routines that have
   been extracted from the V8 JavaScript engine. The code has been
   refactored and improved so that it can be used more easily in other
   projects.
 </longdescription>
+  <upstream>
+    <remote-id type="github">google/double-conversion</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/iksemel/metadata.xml b/dev-libs/iksemel/metadata.xml
index 437357762b59..e561cde924fa 100644
--- a/dev-libs/iksemel/metadata.xml
+++ b/dev-libs/iksemel/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>net-im</herd>
 	<upstream>
 		<remote-id type="google-code">iksemel</remote-id>
+		<remote-id type="github">meduketto/iksemel</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libdivsufsort/metadata.xml b/dev-libs/libdivsufsort/metadata.xml
index 5cb9324943ab..4b9870736208 100644
--- a/dev-libs/libdivsufsort/metadata.xml
+++ b/dev-libs/libdivsufsort/metadata.xml
@@ -5,4 +5,7 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">y-256/libdivsufsort</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libdnet/metadata.xml b/dev-libs/libdnet/metadata.xml
index fb093adfd4cc..08918c9b021a 100644
--- a/dev-libs/libdnet/metadata.xml
+++ b/dev-libs/libdnet/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>netmon</herd>
 	<upstream>
 		<remote-id type="google-code">libdnet</remote-id>
+		<remote-id type="github">dugsong/libdnet</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/liblouis/metadata.xml b/dev-libs/liblouis/metadata.xml
index b723de1dbba2..2d30215f74d8 100644
--- a/dev-libs/liblouis/metadata.xml
+++ b/dev-libs/liblouis/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>accessibility</herd>
+	<herd>accessibility</herd>
+	<upstream>
+		<remote-id type="github">liblouis/liblouis</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/uchardet/metadata.xml b/dev-libs/uchardet/metadata.xml
index 08e15306aeac..bfe4d0155d48 100644
--- a/dev-libs/uchardet/metadata.xml
+++ b/dev-libs/uchardet/metadata.xml
@@ -10,4 +10,7 @@
 		<email>nikoli@gmx.us</email>
 		<name>Nikoli</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">BYVoid/uchardet</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/SNMP_Session/metadata.xml b/dev-perl/SNMP_Session/metadata.xml
index 68c550016736..a8c317e614dc 100644
--- a/dev-perl/SNMP_Session/metadata.xml
+++ b/dev-perl/SNMP_Session/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="google-code">snmp-session</remote-id>
+		<remote-id type="github">sleinen/snmp-session</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/google-api-adwords-perl/metadata.xml b/dev-perl/google-api-adwords-perl/metadata.xml
index e5b91425a40f..5f765fb3b118 100644
--- a/dev-perl/google-api-adwords-perl/metadata.xml
+++ b/dev-perl/google-api-adwords-perl/metadata.xml
@@ -5,4 +5,7 @@
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">googleads/googleads-perl-lib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/botocore/metadata.xml b/dev-python/botocore/metadata.xml
index a82bafe4480d..2df0b5cad9d4 100644
--- a/dev-python/botocore/metadata.xml
+++ b/dev-python/botocore/metadata.xml
@@ -9,5 +9,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">boto/botocore</remote-id>
+		<remote-id type="pypi">botocore</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/cachetools/metadata.xml b/dev-python/cachetools/metadata.xml
index d5dfd322223c..a9d3cb9fbac7 100644
--- a/dev-python/cachetools/metadata.xml
+++ b/dev-python/cachetools/metadata.xml
@@ -7,4 +7,7 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">cachetools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/ctypesgen/metadata.xml b/dev-python/ctypesgen/metadata.xml
index 301d2207cc29..d704e40edecb 100644
--- a/dev-python/ctypesgen/metadata.xml
+++ b/dev-python/ctypesgen/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
+	<upstream>
+		<remote-id type="github">davidjamesca/ctypesgen</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/debtcollector/metadata.xml b/dev-python/debtcollector/metadata.xml
index d5dfd322223c..002659d5cd96 100644
--- a/dev-python/debtcollector/metadata.xml
+++ b/dev-python/debtcollector/metadata.xml
@@ -7,4 +7,7 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">debtcollector</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/dpkt/metadata.xml b/dev-python/dpkt/metadata.xml
index 00e58c73a3d2..9cde35f5398e 100644
--- a/dev-python/dpkt/metadata.xml
+++ b/dev-python/dpkt/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>python</herd>
 	<upstream>
 		<remote-id type="google-code">dpkt</remote-id>
+		<remote-id type="github">kbandla/dpkt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/fasteners/metadata.xml b/dev-python/fasteners/metadata.xml
index d5dfd322223c..cc1098302d75 100644
--- a/dev-python/fasteners/metadata.xml
+++ b/dev-python/fasteners/metadata.xml
@@ -7,4 +7,7 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">fasteners</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/functools32/metadata.xml b/dev-python/functools32/metadata.xml
index 301d2207cc29..bd3962cc8632 100644
--- a/dev-python/functools32/metadata.xml
+++ b/dev-python/functools32/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">functools32</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/futurist/metadata.xml b/dev-python/futurist/metadata.xml
index d5dfd322223c..52c7b02068b0 100644
--- a/dev-python/futurist/metadata.xml
+++ b/dev-python/futurist/metadata.xml
@@ -7,4 +7,7 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">futurist</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/gmpy/metadata.xml b/dev-python/gmpy/metadata.xml
index f60e7204ca7a..946960966eee 100644
--- a/dev-python/gmpy/metadata.xml
+++ b/dev-python/gmpy/metadata.xml
@@ -10,6 +10,7 @@
 </longdescription>
   <upstream>
     <remote-id type="pypi">gmpy2</remote-id>
+    <remote-id type="github">aleaxit/gmpy</remote-id>
   </upstream>
   <use>
     <flag name="mpir">Use <pkg>sci-libs/mpir</pkg> as gmp implementation</flag>
diff --git a/dev-python/jsonschema/metadata.xml b/dev-python/jsonschema/metadata.xml
index 31179ec4c84f..1b7182d5cfb7 100644
--- a/dev-python/jsonschema/metadata.xml
+++ b/dev-python/jsonschema/metadata.xml
@@ -11,5 +11,6 @@ Python (supporting 2.6+ including Python 3).
 </longdescription>
   <upstream>
     <remote-id type="pypi">jsonschema</remote-id>
+    <remote-id type="github">Julian/jsonschema</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/netcdf4-python/metadata.xml b/dev-python/netcdf4-python/metadata.xml
index 5ef07a39e7e1..6ddf36f85ec0 100644
--- a/dev-python/netcdf4-python/metadata.xml
+++ b/dev-python/netcdf4-python/metadata.xml
@@ -5,4 +5,7 @@
   <maintainer>
     <email>jlec@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">Unidata/netcdf4-python</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/os-testr/metadata.xml b/dev-python/os-testr/metadata.xml
index d5dfd322223c..83a658fdf7a3 100644
--- a/dev-python/os-testr/metadata.xml
+++ b/dev-python/os-testr/metadata.xml
@@ -7,4 +7,7 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">oslo.log</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/oslo-service/metadata.xml b/dev-python/oslo-service/metadata.xml
index d5dfd322223c..6e22f39eb97d 100644
--- a/dev-python/oslo-service/metadata.xml
+++ b/dev-python/oslo-service/metadata.xml
@@ -7,4 +7,7 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">oslo.service</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pdfrw/metadata.xml b/dev-python/pdfrw/metadata.xml
index 04c2cee1f08b..eae3ef7aec24 100644
--- a/dev-python/pdfrw/metadata.xml
+++ b/dev-python/pdfrw/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>python</herd>
 	<upstream>
 		<remote-id type="pypi">pdfrw</remote-id>
+		<remote-id type="github">pmaupin/pdfrw</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/platinfo/metadata.xml b/dev-python/platinfo/metadata.xml
index 4db3a662b0f4..7b85f99ef402 100644
--- a/dev-python/platinfo/metadata.xml
+++ b/dev-python/platinfo/metadata.xml
@@ -21,5 +21,7 @@
 		- generally safe for usage in filenames
 		- not ugly (e.g. "MSWin32" is ugly) 
 	</longdescription>
+	<upstream>
+		<remote-id type="github">trentm/platinfo</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-python/plumbum/metadata.xml b/dev-python/plumbum/metadata.xml
index f43044e1deed..d9daaefd1772 100644
--- a/dev-python/plumbum/metadata.xml
+++ b/dev-python/plumbum/metadata.xml
@@ -11,4 +11,7 @@
     attempting to mimic the shell syntax (shell combinators) where it makes sense,
     while keeping it all Pythonic and cross-platform.
   </longdescription>
+  <upstream>
+    <remote-id type="pypi">plumbum</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/pssi/metadata.xml b/dev-python/pssi/metadata.xml
index d268875292d5..2ed81f2fca34 100644
--- a/dev-python/pssi/metadata.xml
+++ b/dev-python/pssi/metadata.xml
@@ -5,5 +5,6 @@
 	<herd>python</herd>
 	<upstream>
 		<remote-id type="google-code">pssi</remote-id>
+		<remote-id type="github">Eric-Bourry/pssi</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pybluez/metadata.xml b/dev-python/pybluez/metadata.xml
index 619a2baffac0..04b90bd9fa3c 100644
--- a/dev-python/pybluez/metadata.xml
+++ b/dev-python/pybluez/metadata.xml
@@ -7,5 +7,6 @@ developers to use system bluetooth resources. It works on machines running the
 GNU/Linux operating system and the bluez bluetooth stack.</longdescription>
 	<upstream>
 		<remote-id type="google-code">pybluez</remote-id>
+		<remote-id type="github">karulis/pybluez</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pylast/metadata.xml b/dev-python/pylast/metadata.xml
index 4bdf9326e9c3..1ef6ae53cee8 100644
--- a/dev-python/pylast/metadata.xml
+++ b/dev-python/pylast/metadata.xml
@@ -21,5 +21,6 @@ Features:
 	</longdescription>
   <upstream>
     <remote-id type="pypi">pylast</remote-id>
+    <remote-id type="github">pylast/pylast</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pyminuit/metadata.xml b/dev-python/pyminuit/metadata.xml
index 7bc6ee8ea837..4aae24e5aed0 100644
--- a/dev-python/pyminuit/metadata.xml
+++ b/dev-python/pyminuit/metadata.xml
@@ -5,4 +5,7 @@
     <email>jlec@gentoo.org</email>
     <name>Justin Lecher</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">jpivarski/pyminuit</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/pyodbc/metadata.xml b/dev-python/pyodbc/metadata.xml
index cdef949fdd00..89f9d1846231 100644
--- a/dev-python/pyodbc/metadata.xml
+++ b/dev-python/pyodbc/metadata.xml
@@ -8,5 +8,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">pyodbc</remote-id>
+		<remote-id type="github">mkleehammer/pyodbc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pysendfile/metadata.xml b/dev-python/pysendfile/metadata.xml
index 6814dded9e08..be8676d8f559 100644
--- a/dev-python/pysendfile/metadata.xml
+++ b/dev-python/pysendfile/metadata.xml
@@ -4,5 +4,6 @@
   <herd>openstack</herd>
   <upstream>
     <remote-id type="pypi">pysendfile</remote-id>
+    <remote-id type="github">giampaolo/pysendfile</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pystdf/metadata.xml b/dev-python/pystdf/metadata.xml
index ff8ea3bb9d22..446f808ecd61 100644
--- a/dev-python/pystdf/metadata.xml
+++ b/dev-python/pystdf/metadata.xml
@@ -6,5 +6,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">pystdf</remote-id>
+		<remote-id type="github">cmars/pystdf</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-django/metadata.xml b/dev-python/pytest-django/metadata.xml
index cdf82d15f553..bf79c4ee0c7c 100644
--- a/dev-python/pytest-django/metadata.xml
+++ b/dev-python/pytest-django/metadata.xml
@@ -6,4 +6,7 @@
 		<email>jlec@gentoo.org</email>
 		<name>Justin Lecher</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-django</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-pythonpath/metadata.xml b/dev-python/pytest-pythonpath/metadata.xml
index cdf82d15f553..24eed894bede 100644
--- a/dev-python/pytest-pythonpath/metadata.xml
+++ b/dev-python/pytest-pythonpath/metadata.xml
@@ -6,4 +6,7 @@
 		<email>jlec@gentoo.org</email>
 		<name>Justin Lecher</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-pythonpath</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-gflags/metadata.xml b/dev-python/python-gflags/metadata.xml
index acab986467bf..e79cd6bb6473 100644
--- a/dev-python/python-gflags/metadata.xml
+++ b/dev-python/python-gflags/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>python</herd>
 	<upstream>
 		<remote-id type="google-code">python-gflags</remote-id>
+		<remote-id type="github">gflags/python-gflags</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-memcached/metadata.xml b/dev-python/python-memcached/metadata.xml
index 9e907d287ba4..a64a331f07f5 100644
--- a/dev-python/python-memcached/metadata.xml
+++ b/dev-python/python-memcached/metadata.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<maintainer>
-<email>robbat2@gentoo.org</email>
-<name>Robin H. Johnson</name>
-</maintainer>
-<longdescription lang="en">
+	<herd>python</herd>
+	<maintainer>
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<longdescription lang="en">
 This is a Python based API (implemented in 100% python) for communicating with
 the memcached distributed memory object cache daemon.
 </longdescription>
+	<upstream>
+		<remote-id type="pypi">python-memcached</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-python/python-twitter/metadata.xml b/dev-python/python-twitter/metadata.xml
index b862d3a6e7ce..0aeabd36ac00 100644
--- a/dev-python/python-twitter/metadata.xml
+++ b/dev-python/python-twitter/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>python</herd>
 	<upstream>
 		<remote-id type="google-code">python-twitter</remote-id>
+		<remote-id type="github">bear/python-twitter</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/rfc3986/metadata.xml b/dev-python/rfc3986/metadata.xml
index 30fbe982e3bc..80791af85dc5 100644
--- a/dev-python/rfc3986/metadata.xml
+++ b/dev-python/rfc3986/metadata.xml
@@ -11,5 +11,6 @@
 	</longdescription>
   <upstream>
     <remote-id type="pypi">rfc3986</remote-id>
+    <remote-id type="github">sigmavirus24/rfc3986</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/strict-rfc3339/metadata.xml b/dev-python/strict-rfc3339/metadata.xml
index 301d2207cc29..12edc2a80f56 100644
--- a/dev-python/strict-rfc3339/metadata.xml
+++ b/dev-python/strict-rfc3339/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">strict-rfc3339</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/webcolors/metadata.xml b/dev-python/webcolors/metadata.xml
index 301d2207cc29..eba9034612c7 100644
--- a/dev-python/webcolors/metadata.xml
+++ b/dev-python/webcolors/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">webcolors</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/dmake/metadata.xml b/dev-util/dmake/metadata.xml
index 8a9b49eec325..75e0c5991789 100644
--- a/dev-util/dmake/metadata.xml
+++ b/dev-util/dmake/metadata.xml
@@ -5,5 +5,7 @@
 		<email>chithanh@gentoo.org</email>
 		<name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">mohawk2/dmake</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/google-perftools/metadata.xml b/dev-util/google-perftools/metadata.xml
index 450a4d64b8ac..e3c97b0b8830 100644
--- a/dev-util/google-perftools/metadata.xml
+++ b/dev-util/google-perftools/metadata.xml
@@ -4,23 +4,23 @@
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
-
   <use>
     <flag name="largepages">
       Use (experimental) larger pages for tcmalloc, this increases
       memory usage, but should speed up the allocation/free
       operations.
     </flag>
-
     <flag name="debug">
       Build a set of libraries with debug support (so-called
       debugalloc). These are available by default but are not needed
       unless you're actually developing using tcmalloc.
     </flag>
-
     <flag name="minimal">
       Only build the tcmalloc_minimal library, ignoring the heap
       checker and the profilers.
     </flag>
   </use>
+  <upstream>
+    <remote-id type="github">gperftools/gperftools</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-util/gprof2dot/metadata.xml b/dev-util/gprof2dot/metadata.xml
index 16bcc9f800a2..2022c0142d5b 100644
--- a/dev-util/gprof2dot/metadata.xml
+++ b/dev-util/gprof2dot/metadata.xml
@@ -5,4 +5,7 @@
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">jrfonseca/gprof2dot</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/include-what-you-use/metadata.xml b/dev-util/include-what-you-use/metadata.xml
index 49bf44dac71e..c489d7430064 100644
--- a/dev-util/include-what-you-use/metadata.xml
+++ b/dev-util/include-what-you-use/metadata.xml
@@ -5,4 +5,7 @@
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">include-what-you-use/include-what-you-use</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/open-vcdiff/metadata.xml b/dev-util/open-vcdiff/metadata.xml
index af2678460755..5ee3b9c53307 100644
--- a/dev-util/open-vcdiff/metadata.xml
+++ b/dev-util/open-vcdiff/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">open-vcdiff</remote-id>
+		<remote-id type="github">google/open-vcdiff</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/shunit2/metadata.xml b/dev-util/shunit2/metadata.xml
index 800122e2b704..4276624f29ef 100644
--- a/dev-util/shunit2/metadata.xml
+++ b/dev-util/shunit2/metadata.xml
@@ -11,5 +11,6 @@
   	can do the job.</longdescription>
 	<upstream>
 		<remote-id type="google-code">shunit2</remote-id>
+		<remote-id type="github">kward/shunit2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/ticpp/metadata.xml b/dev-util/ticpp/metadata.xml
index 6c08151bd39f..a0cb902846cd 100644
--- a/dev-util/ticpp/metadata.xml
+++ b/dev-util/ticpp/metadata.xml
@@ -5,5 +5,7 @@
 		<email>ago@gentoo.org</email>
 		<name>Agostino Sarubbo</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">rjpcomputing/ticpp</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-vcs/gitinspector/metadata.xml b/dev-vcs/gitinspector/metadata.xml
index 4a00a64b40ae..d2c36602f3e1 100644
--- a/dev-vcs/gitinspector/metadata.xml
+++ b/dev-vcs/gitinspector/metadata.xml
@@ -4,4 +4,7 @@
   <maintainer>
     <email>jlec@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">ejwa/gitinspector</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/games-arcade/opentyrian/metadata.xml b/games-arcade/opentyrian/metadata.xml
index 1dceee43bf7c..b71c7c96095b 100644
--- a/games-arcade/opentyrian/metadata.xml
+++ b/games-arcade/opentyrian/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>chainsaw@gentoo.org</email>
-  <name>Tony Vroon</name>
-</maintainer>
-<herd>games</herd>
+  <maintainer>
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <herd>games</herd>
+  <upstream>
+    <remote-id type="bitbucket">opentyrian/opentyrian</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-gfx/paint-mono/metadata.xml b/media-gfx/paint-mono/metadata.xml
index 069dd9168434..3e1ab24888e2 100644
--- a/media-gfx/paint-mono/metadata.xml
+++ b/media-gfx/paint-mono/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>dotnet</herd>
 	<upstream>
 		<remote-id type="google-code">paint-mono</remote-id>
+		<remote-id type="github">shana/paint-mono</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/qiviewer/metadata.xml b/media-gfx/qiviewer/metadata.xml
index ca0e4aca4059..77264be218d8 100644
--- a/media-gfx/qiviewer/metadata.xml
+++ b/media-gfx/qiviewer/metadata.xml
@@ -6,7 +6,10 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
-<use>
-	<flag name="webp">Build support for WEBP image format</flag>
-</use>
+	<use>
+		<flag name="webp">Build support for WEBP image format</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">samkpo/qiviewer</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/raw-thumbnailer/metadata.xml b/media-gfx/raw-thumbnailer/metadata.xml
index 7e6529ba09e3..65b786ac033f 100644
--- a/media-gfx/raw-thumbnailer/metadata.xml
+++ b/media-gfx/raw-thumbnailer/metadata.xml
@@ -8,5 +8,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">raw-thumbnailer</remote-id>
+		<remote-id type="github">erlendd/raw-thumbnailer</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/game-music-emu/metadata.xml b/media-libs/game-music-emu/metadata.xml
index 1d206b9a1f24..09332b4694c7 100644
--- a/media-libs/game-music-emu/metadata.xml
+++ b/media-libs/game-music-emu/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>sound</herd>
 	<upstream>
 		<remote-id type="google-code">game-music-emu</remote-id>
+		<remote-id type="bitbucket">mpyne/game-music-emu</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/iulib/metadata.xml b/media-libs/iulib/metadata.xml
index 0213a52c37fe..da2a1b940f55 100644
--- a/media-libs/iulib/metadata.xml
+++ b/media-libs/iulib/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">iulib</remote-id>
+		<remote-id type="github">tmbdev/iulib</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/openjpeg/metadata.xml b/media-libs/openjpeg/metadata.xml
index f50e8dfa9018..7c804ffbed5a 100644
--- a/media-libs/openjpeg/metadata.xml
+++ b/media-libs/openjpeg/metadata.xml
@@ -5,5 +5,6 @@
 	<upstream>
 		<remote-id type="google-code">openjpeg</remote-id>
 		<remote-id type="sourceforge">openjpeg.mirror</remote-id>
+		<remote-id type="github">uclouvain/openjpeg</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-plugins/quodlibet-plugins/metadata.xml b/media-plugins/quodlibet-plugins/metadata.xml
index 2b2512fb3b3b..6f518c30ace9 100644
--- a/media-plugins/quodlibet-plugins/metadata.xml
+++ b/media-plugins/quodlibet-plugins/metadata.xml
@@ -6,4 +6,7 @@
 		<name>Matthias Maier</name>
 	</maintainer>
 	<herd>sound</herd>
+	<upstream>
+		<remote-id type="github">quodlibet/quodlibet</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/cantata/metadata.xml b/media-sound/cantata/metadata.xml
index 4bf3ab690394..312ce3f77280 100644
--- a/media-sound/cantata/metadata.xml
+++ b/media-sound/cantata/metadata.xml
@@ -9,4 +9,7 @@
 		<flag name="replaygain">Enable ReplayGain support, for relative volume adjustments</flag>
 		<flag name="streams">Enable support for streams tab (to save favourite streams, and search for others)</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">cdrummond/cantata</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/gejengel/metadata.xml b/media-sound/gejengel/metadata.xml
index d9fbae1396c9..b6d93507fdf1 100644
--- a/media-sound/gejengel/metadata.xml
+++ b/media-sound/gejengel/metadata.xml
@@ -11,5 +11,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="google-code">gejengel</remote-id>
+		<remote-id type="github">dirkvdb/gejengel</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/volti/metadata.xml b/media-sound/volti/metadata.xml
index b7f49681830a..be06d1013244 100644
--- a/media-sound/volti/metadata.xml
+++ b/media-sound/volti/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>sound</herd>
 	<upstream>
 		<remote-id type="google-code">volti</remote-id>
+		<remote-id type="github">gen2brain/volti</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-video/kffmpegthumbnailer/metadata.xml b/media-video/kffmpegthumbnailer/metadata.xml
index cb33053f8c78..6e5a6249ce5f 100644
--- a/media-video/kffmpegthumbnailer/metadata.xml
+++ b/media-video/kffmpegthumbnailer/metadata.xml
@@ -8,5 +8,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">ffmpegthumbnailer</remote-id>
+		<remote-id type="github">dirkvdb/ffmpegthumbnailer</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-video/subdl/metadata.xml b/media-video/subdl/metadata.xml
index 564e8cdd2612..e87744a17fe7 100644
--- a/media-video/subdl/metadata.xml
+++ b/media-video/subdl/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">subdl</remote-id>
+		<remote-id type="github">akexakex/subdl</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/dnsenum/metadata.xml b/net-analyzer/dnsenum/metadata.xml
index 5fcbf8e1851a..f59f8a409b18 100644
--- a/net-analyzer/dnsenum/metadata.xml
+++ b/net-analyzer/dnsenum/metadata.xml
@@ -1,11 +1,13 @@
 <?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>
-</maintainer>
-<longdescription lang="en">
+	<maintainer>
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<longdescription lang="en">
 </longdescription>
+	<upstream>
+		<remote-id type="github">fwaeytens/dnsenum</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/net-analyzer/fragroute/metadata.xml b/net-analyzer/fragroute/metadata.xml
index 78692635ad22..9c9de543b91c 100644
--- a/net-analyzer/fragroute/metadata.xml
+++ b/net-analyzer/fragroute/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>netmon</herd>
+	<upstream>
+		<remote-id type="github">stsi/fragroute-ipv6</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/metasploit/metadata.xml b/net-analyzer/metasploit/metadata.xml
index c118704ddaef..eae4ef006e12 100644
--- a/net-analyzer/metasploit/metadata.xml
+++ b/net-analyzer/metasploit/metadata.xml
@@ -7,8 +7,11 @@
 		<description>Very delicate package, ask before you touch please</description>
 	</maintainer>
 	<use>
-		<flag name='development'>Install dependencies needed for metasploit and exploit development</flag>
-		<flag name='oracle'>Enable restricted oracle modules which have additional deps</flag>
-		<flag name='pcap'>Enable libpcap for packet sniffing</flag>
+		<flag name="development">Install dependencies needed for metasploit and exploit development</flag>
+		<flag name="oracle">Enable restricted oracle modules which have additional deps</flag>
+		<flag name="pcap">Enable libpcap for packet sniffing</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">rapid7/metasploit-framework</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-dialup/picocom/metadata.xml b/net-dialup/picocom/metadata.xml
index 418d529e8a68..112e7d920cf9 100644
--- a/net-dialup/picocom/metadata.xml
+++ b/net-dialup/picocom/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">picocom</remote-id>
+		<remote-id type="github">npat-efault/picocom</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-firewall/ufw-frontends/metadata.xml b/net-firewall/ufw-frontends/metadata.xml
index 9558d7412c05..9de1f77c1793 100644
--- a/net-firewall/ufw-frontends/metadata.xml
+++ b/net-firewall/ufw-frontends/metadata.xml
@@ -11,7 +11,12 @@
 	for UFW using PyGTK and PyQt (the latter in early stage of development).</longdescription>
 	<upstream>
 		<remote-id type="google-code">ufw-frontends</remote-id>
+		<remote-id type="github">baudm/ufw-frontends</remote-id>
 	</upstream>
-	<use><flag name="policykit">Use pkexec to gain root privileges</flag></use>
-	<use><flag name="kde">Use kdesu to gain root privileges (note: the flag has lower priority than "policykit")</flag></use>
+	<use>
+		<flag name="policykit">Use pkexec to gain root privileges</flag>
+	</use>
+	<use>
+		<flag name="kde">Use kdesu to gain root privileges (note: the flag has lower priority than "policykit")</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-libs/libcrafter/metadata.xml b/net-libs/libcrafter/metadata.xml
index 5ecde58044f6..6bfb7dbc5f46 100644
--- a/net-libs/libcrafter/metadata.xml
+++ b/net-libs/libcrafter/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
-<longdescription lang='en'>
+	<herd>netmon</herd>
+	<longdescription lang="en">
 Libcrafter is a high level library for C++ designed to facilitate the creation
 and decoding of network packets. It is able to craft or decode packets of most
 common networks protocols, send them on the wire, capture them and match
@@ -27,4 +27,7 @@ Ethernet, SLL (Linux cooked-mode capture), ARP, DHCP, DHCP options, IP, IP
 options, IPv6, ICMP, ICMPv6, ICMP extensions, ICMPv6 extensions, TCP, TCP
 options, UDP and DNS
 </longdescription>
+	<upstream>
+		<remote-id type="github">pellegre/libcrafter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/pacparser/metadata.xml b/net-libs/pacparser/metadata.xml
index 67c25ef2c2c0..e4e396310bbe 100644
--- a/net-libs/pacparser/metadata.xml
+++ b/net-libs/pacparser/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>bicatali@gentoo.org</email>
-</maintainer>
-<longdescription>
+  <maintainer>
+    <email>bicatali@gentoo.org</email>
+  </maintainer>
+  <longdescription>
   A library to parse proxy auto-config (PAC) files. Proxy auto-config
   files are a vastly used proxy configuration method these days. Web
   browsers can use a PAC file to determine which proxy server to use
@@ -20,7 +20,8 @@
   add this PAC file parsing capability to  any program (C and Python
   supported right now).
 </longdescription>
-<upstream>
-  <remote-id type="google-code">pacproxy</remote-id>
-</upstream>
+  <upstream>
+    <remote-id type="google-code">pacproxy</remote-id>
+    <remote-id type="github">pacparser/pacparser</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/openvpn-auth-ldap/metadata.xml b/net-misc/openvpn-auth-ldap/metadata.xml
index 3e7867df9601..a95d24666619 100644
--- a/net-misc/openvpn-auth-ldap/metadata.xml
+++ b/net-misc/openvpn-auth-ldap/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">openvpn-auth-ldap</remote-id>
+		<remote-id type="github">threerings/openvpn-auth-ldap</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/ps3mediaserver/metadata.xml b/net-misc/ps3mediaserver/metadata.xml
index b4d63de760df..3e5aa55ddaa5 100644
--- a/net-misc/ps3mediaserver/metadata.xml
+++ b/net-misc/ps3mediaserver/metadata.xml
@@ -16,5 +16,6 @@
 	<upstream>
 		<remote-id type="google-code">ps3mediaserver</remote-id>
 		<remote-id type="sourceforge">ps3mediaserver</remote-id>
+		<remote-id type="github">ps3mediaserver/ps3mediaserver</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-nds/nsscache/metadata.xml b/net-nds/nsscache/metadata.xml
index 66627b6b4458..51774ad22374 100644
--- a/net-nds/nsscache/metadata.xml
+++ b/net-nds/nsscache/metadata.xml
@@ -10,5 +10,6 @@
 	</use>
 	<upstream>
 		<remote-id type="google-code">nsscache</remote-id>
+		<remote-id type="github">google/nsscache</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-wireless/mfoc/metadata.xml b/net-wireless/mfoc/metadata.xml
index bfcb6974f1c4..1fb5c16ace5d 100644
--- a/net-wireless/mfoc/metadata.xml
+++ b/net-wireless/mfoc/metadata.xml
@@ -5,4 +5,7 @@
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">nfc-tools/mfoc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-astronomy/casacore/metadata.xml b/sci-astronomy/casacore/metadata.xml
index 3f17c8233202..ffd9290dad47 100644
--- a/sci-astronomy/casacore/metadata.xml
+++ b/sci-astronomy/casacore/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
-<longdescription lang="en">
+  <herd>sci-astronomy</herd>
+  <longdescription lang="en">
   A set of libraries for the the Common Astronomy Software
   Applications for radioastronomy. This project contains C++ libraries
   which were the code of the discontinued AIPS++ package.
 </longdescription>
-<upstream>
-  <remote-id type="google-code">casacore</remote-id>
-</upstream>
-<use>
-  <flag name="data">Installs measures and data (pulls <pkg>sci-astronomy/casa-data</pkg>)</flag>
-</use>
+  <upstream>
+    <remote-id type="google-code">casacore</remote-id>
+    <remote-id type="github">casacore/casacore</remote-id>
+  </upstream>
+  <use>
+    <flag name="data">Installs measures and data (pulls <pkg>sci-astronomy/casa-data</pkg>)</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-biology/beast-mcmc/metadata.xml b/sci-biology/beast-mcmc/metadata.xml
index f17a827e3101..7764bf07c826 100644
--- a/sci-biology/beast-mcmc/metadata.xml
+++ b/sci-biology/beast-mcmc/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-biology</herd>
+  <upstream>
+    <remote-id type="github">beast-dev/beast-mcmc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-chemistry/pdb-tools/metadata.xml b/sci-chemistry/pdb-tools/metadata.xml
index 13e9a3c93979..0d75122ff062 100644
--- a/sci-chemistry/pdb-tools/metadata.xml
+++ b/sci-chemistry/pdb-tools/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="google-code">pdb-tools</remote-id>
+    <remote-id type="github">harmslab/pdbtools</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-geosciences/qmapshack/metadata.xml b/sci-geosciences/qmapshack/metadata.xml
index b9960f615da4..e9f94a17a31f 100644
--- a/sci-geosciences/qmapshack/metadata.xml
+++ b/sci-geosciences/qmapshack/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>grozin@gentoo.org</email>
-  <name>Andrey Grozin</name>
-</maintainer>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <maintainer>
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <longdescription lang="en">
   Use QMapShack to plan your next outdoor trip or to visualize and archive
   all the GPS recordings of your past exciting adventures.
   QMapShack is the next generation of the famous QLandkarte GT application.
   And of course it's even better and easier to use.
 </longdescription>
+  <upstream>
+    <remote-id type="bitbucket">maproom/qmapshack</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/chname/metadata.xml b/sys-apps/chname/metadata.xml
index 7d6ebf36c141..a756d5496822 100644
--- a/sys-apps/chname/metadata.xml
+++ b/sys-apps/chname/metadata.xml
@@ -7,5 +7,6 @@
 	<longdescription lang="en">Run a command with a new system hostname. Requires utsname namespaces.</longdescription>
 	<upstream>
 		<remote-id type="google-code">chname</remote-id>
+		<remote-id type="github">marineam/chname</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/inxi/metadata.xml b/sys-apps/inxi/metadata.xml
index 61c052a97a13..a73f9975f49b 100644
--- a/sys-apps/inxi/metadata.xml
+++ b/sys-apps/inxi/metadata.xml
@@ -5,4 +5,7 @@
 		<email>dastergon@gentoo.org</email>
 		<name>Pavlos Ratis</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">smxi/inxi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/mtree/metadata.xml b/sys-apps/mtree/metadata.xml
index 659da0ca93c2..3bdc7d730dd6 100644
--- a/sys-apps/mtree/metadata.xml
+++ b/sys-apps/mtree/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>base-system</herd>
+	<upstream>
+		<remote-id type="github">archiecobbs/mtree-port</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-auth/bioapi/metadata.xml b/sys-auth/bioapi/metadata.xml
index 9a34902f8fa6..edc31edb93e9 100644
--- a/sys-auth/bioapi/metadata.xml
+++ b/sys-auth/bioapi/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">bioapi-linux</remote-id>
+		<remote-id type="github">mr-c/bioapi-linux</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-auth/libnss-cache/metadata.xml b/sys-auth/libnss-cache/metadata.xml
index b38a94f524aa..fc8e73d671a5 100644
--- a/sys-auth/libnss-cache/metadata.xml
+++ b/sys-auth/libnss-cache/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">nsscache</remote-id>
+		<remote-id type="github">google/nsscache</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/exfat-utils/metadata.xml b/sys-fs/exfat-utils/metadata.xml
index 7b05b18e4457..26c5b26cf2bc 100644
--- a/sys-fs/exfat-utils/metadata.xml
+++ b/sys-fs/exfat-utils/metadata.xml
@@ -8,5 +8,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">exfat</remote-id>
+		<remote-id type="github">relan/exfat</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/fuse-exfat/metadata.xml b/sys-fs/fuse-exfat/metadata.xml
index 7b05b18e4457..26c5b26cf2bc 100644
--- a/sys-fs/fuse-exfat/metadata.xml
+++ b/sys-fs/fuse-exfat/metadata.xml
@@ -8,5 +8,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">exfat</remote-id>
+		<remote-id type="github">relan/exfat</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/fuse-zip/metadata.xml b/sys-fs/fuse-zip/metadata.xml
index 37f5c95810cb..196300228e33 100644
--- a/sys-fs/fuse-zip/metadata.xml
+++ b/sys-fs/fuse-zip/metadata.xml
@@ -9,5 +9,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="google-code">fuse-zip</remote-id>
+		<remote-id type="bitbucket">agalanin/fuse-zip</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/s3backer/metadata.xml b/sys-fs/s3backer/metadata.xml
index 45fcce25c7e2..368e18c40a07 100644
--- a/sys-fs/s3backer/metadata.xml
+++ b/sys-fs/s3backer/metadata.xml
@@ -6,5 +6,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">s3backer</remote-id>
+		<remote-id type="github">archiecobbs/s3backer</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-process/cronutils/metadata.xml b/sys-process/cronutils/metadata.xml
index 23f23b2beb69..9de3a06a8d3e 100644
--- a/sys-process/cronutils/metadata.xml
+++ b/sys-process/cronutils/metadata.xml
@@ -14,5 +14,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="google-code">cronutils</remote-id>
+		<remote-id type="github">google/cronutils</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/www-apache/mod_authnz_external/metadata.xml b/www-apache/mod_authnz_external/metadata.xml
index ba08acf34594..e0670f817568 100644
--- a/www-apache/mod_authnz_external/metadata.xml
+++ b/www-apache/mod_authnz_external/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">mod-auth-external</remote-id>
+		<remote-id type="github">phokz/mod-auth-external</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/www-apache/pwauth/metadata.xml b/www-apache/pwauth/metadata.xml
index f0b4684da6fe..a185bd752093 100644
--- a/www-apache/pwauth/metadata.xml
+++ b/www-apache/pwauth/metadata.xml
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
 	<use>
-		<flag name='domain-aware'>Ignore leading domain names in username
+		<flag name="domain-aware">Ignore leading domain names in username
 			(Windows compat)</flag>
-		<flag name='faillog'>Log failed login attempts</flag>
-		<flag name='ignore-case'>Ignore string case in username (mostly Windows
+		<flag name="faillog">Log failed login attempts</flag>
+		<flag name="ignore-case">Ignore string case in username (mostly Windows
 			compat)</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">phokz/pwauth</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/rutorrent/metadata.xml b/www-apps/rutorrent/metadata.xml
index e814a67b0855..53065a2d2338 100644
--- a/www-apps/rutorrent/metadata.xml
+++ b/www-apps/rutorrent/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">rutorrent</remote-id>
+		<remote-id type="github">Novik/ruTorrent</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/basqet/metadata.xml b/x11-misc/basqet/metadata.xml
index 7aa61dde7f6e..c1ca52bbfce4 100644
--- a/x11-misc/basqet/metadata.xml
+++ b/x11-misc/basqet/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<remote-id type="google-code">basqet</remote-id>
+		<remote-id type="bitbucket">ridderby/basqet</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/grun/metadata.xml b/x11-misc/grun/metadata.xml
index 11cb726ccd43..62788e9b0972 100644
--- a/x11-misc/grun/metadata.xml
+++ b/x11-misc/grun/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>desktop-misc</herd>
 	<upstream>
 		<remote-id type="google-code">grun</remote-id>
+		<remote-id type="github">lrgc/grun</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/ktsuss/metadata.xml b/x11-misc/ktsuss/metadata.xml
index 1d6819a1c170..a6a88629dac8 100644
--- a/x11-misc/ktsuss/metadata.xml
+++ b/x11-misc/ktsuss/metadata.xml
@@ -9,5 +9,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">ktsuss</remote-id>
+		<remote-id type="github">nomius/ktsuss</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/qlipper/metadata.xml b/x11-misc/qlipper/metadata.xml
index dc439f7e84f5..417967a8329b 100644
--- a/x11-misc/qlipper/metadata.xml
+++ b/x11-misc/qlipper/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>qt</herd>
+	<herd>qt</herd>
+	<upstream>
+		<remote-id type="github">pvanek/qlipper</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/qxkb/metadata.xml b/x11-misc/qxkb/metadata.xml
index dc439f7e84f5..32bdd4ceba31 100644
--- a/x11-misc/qxkb/metadata.xml
+++ b/x11-misc/qxkb/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>qt</herd>
+	<herd>qt</herd>
+	<upstream>
+		<remote-id type="github">disels/qxkb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/wbar/metadata.xml b/x11-misc/wbar/metadata.xml
index a5d082ae569c..2b43af1b2da0 100644
--- a/x11-misc/wbar/metadata.xml
+++ b/x11-misc/wbar/metadata.xml
@@ -7,5 +7,6 @@
 	</use>
 	<upstream>
 		<remote-id type="google-code">wbar</remote-id>
+		<remote-id type="github">rodolf0/wbar</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-plugins/pidgintex/metadata.xml b/x11-plugins/pidgintex/metadata.xml
index 820799abbc00..a3441f9bf467 100644
--- a/x11-plugins/pidgintex/metadata.xml
+++ b/x11-plugins/pidgintex/metadata.xml
@@ -8,5 +8,6 @@ intended for math but mathTeX is fully compatible with LaTeX and any package can
 be used and mimeTeX also supports many other features.</longdescription>
 	<upstream>
 		<remote-id type="google-code">pidgintex</remote-id>
+		<remote-id type="github">Micket/pidgintex</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-plugins/prpltwtr/metadata.xml b/x11-plugins/prpltwtr/metadata.xml
index 812e5886b4c9..fed61c0c299f 100644
--- a/x11-plugins/prpltwtr/metadata.xml
+++ b/x11-plugins/prpltwtr/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">prpltwtr</remote-id>
+		<remote-id type="github">mikeage/prpltwtr</remote-id>
 	</upstream>
 </pkgmetadata>