Update remote-ids in metadata.xml

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

62 files changed, 250 insertions, 113 deletions

diff --git a/app-admin/checksec/metadata.xml b/app-admin/checksec/metadata.xml
index 16bcc9f800..f1f666f2d3 100644
--- a/app-admin/checksec/metadata.xml
+++ b/app-admin/checksec/metadata.xml
@@ -1,8 +1,11 @@
-<?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>
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">slimm609/checksec.sh</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/qtpass/metadata.xml b/app-admin/qtpass/metadata.xml
index 6c4ad75441..fdc73dc12d 100644
--- a/app-admin/qtpass/metadata.xml
+++ b/app-admin/qtpass/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>proxy-maintainers</herd>
@@ -14,5 +14,6 @@ QtPass is a multi-platform GUI for pass, the standard unix password manager.
 		<changelog>https://github.com/IJHack/qtpass/releases</changelog>
 		<doc>https://github.com/IJHack/qtpass/wiki</doc>
 		<bugs-to>https://github.com/IJHack/qtpass/issues</bugs-to>
+		<remote-id type="github">IJHack/qtpass</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-backup/attic/metadata.xml b/app-backup/attic/metadata.xml
index 1e7587374f..52a07f2169 100644
--- a/app-backup/attic/metadata.xml
+++ b/app-backup/attic/metadata.xml
@@ -1,8 +1,11 @@
-<?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>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">jborg/attic</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/acme/metadata.xml b/app-crypt/acme/metadata.xml
index bfcb6974f1..c626e3262e 100644
--- a/app-crypt/acme/metadata.xml
+++ b/app-crypt/acme/metadata.xml
@@ -1,8 +1,11 @@
-<?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>
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">letsencrypt/letsencrypt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/letsencrypt/metadata.xml b/app-crypt/letsencrypt/metadata.xml
index bfcb6974f1..c626e3262e 100644
--- a/app-crypt/letsencrypt/metadata.xml
+++ b/app-crypt/letsencrypt/metadata.xml
@@ -1,8 +1,11 @@
-<?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>
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">letsencrypt/letsencrypt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-vim/salt-vim/metadata.xml b/app-vim/salt-vim/metadata.xml
index 2734e0929e..371f108ea5 100644
--- a/app-vim/salt-vim/metadata.xml
+++ b/app-vim/salt-vim/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>vim</herd>
@@ -6,4 +6,7 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">saltstack/salt-vim</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-go/go-colortext/metadata.xml b/dev-go/go-colortext/metadata.xml
index 829fdae337..0288559682 100644
--- a/dev-go/go-colortext/metadata.xml
+++ b/dev-go/go-colortext/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>
@@ -8,4 +8,7 @@
 	<longdescription lang="en">
 		This go package allows you to change the color of text in the console.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">daviddengcn/go-colortext</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-go/gom/metadata.xml b/dev-go/gom/metadata.xml
index fdb19c3ee7..bb5c3966af 100644
--- a/dev-go/gom/metadata.xml
+++ b/dev-go/gom/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>
@@ -8,4 +8,7 @@
 	<longdescription lang="en">
 		Gom is a dependency manager for Go which is similar to Ruby's bundle.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">mattn/gom</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/stringtemplate/metadata.xml b/dev-java/stringtemplate/metadata.xml
index 7303cef969..a02bbaab39 100644
--- a/dev-java/stringtemplate/metadata.xml
+++ b/dev-java/stringtemplate/metadata.xml
@@ -1,5 +1,8 @@
-<?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>java</herd>
+	<upstream>
+		<remote-id type="github">antlr/stringtemplate4</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/keybinder/metadata.xml b/dev-libs/keybinder/metadata.xml
index 33b965f5be..8348bfd1dc 100644
--- a/dev-libs/keybinder/metadata.xml
+++ b/dev-libs/keybinder/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>
@@ -6,6 +6,9 @@
     <name>Samuli Suominen</name>
   </maintainer>
   <use>
-    <flag name='introspection'>Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
+    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
   </use>
+  <upstream>
+    <remote-id type="github">engla/keybinder</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libb64/metadata.xml b/dev-libs/libb64/metadata.xml
index 5cb9324943..f28dc07010 100644
--- a/dev-libs/libb64/metadata.xml
+++ b/dev-libs/libb64/metadata.xml
@@ -1,8 +1,11 @@
-<?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>
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">libb64</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lisp/cl-ppcre-unicode/metadata.xml b/dev-lisp/cl-ppcre-unicode/metadata.xml
index a1563ab58b..b2ce1c4d51 100644
--- a/dev-lisp/cl-ppcre-unicode/metadata.xml
+++ b/dev-lisp/cl-ppcre-unicode/metadata.xml
@@ -1,7 +1,7 @@
-<?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>common-lisp</herd>
+	<herd>common-lisp</herd>
 	<longdescription>
 		CL-PPCRE is a portable regular expression library for Common Lisp
 		which has the following features: 
@@ -13,4 +13,7 @@
 		* includes convenience features
 		* well-documented.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">edicl/cl-ppcre</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lisp/cl-ppcre/metadata.xml b/dev-lisp/cl-ppcre/metadata.xml
index fdb08d91fa..d7a0a16fdb 100644
--- a/dev-lisp/cl-ppcre/metadata.xml
+++ b/dev-lisp/cl-ppcre/metadata.xml
@@ -1,8 +1,8 @@
-<?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>common-lisp</herd>
-<longdescription>
+	<herd>common-lisp</herd>
+	<longdescription>
 CL-PPCRE is a portable regular expression library for Common Lisp
 which has the following features: 
  
@@ -12,6 +12,8 @@ which has the following features:
  * thread-safe 
  * includes convenience features
  * well-documented.
-
-</longdescription>
+	</longdescription>
+	<upstream>
+		<remote-id type="github">edicl/cl-ppcre</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lisp/cl-unicode/metadata.xml b/dev-lisp/cl-unicode/metadata.xml
index 433fe2c0fc..4b20b690e6 100644
--- a/dev-lisp/cl-unicode/metadata.xml
+++ b/dev-lisp/cl-unicode/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>common-lisp</herd>
@@ -11,4 +11,7 @@
 		with one that is Unicode-aware and is used to enhance CL-PPCRE with
 		Unicode properties.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">edicl/cl-unicode</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lisp/flexi-streams/metadata.xml b/dev-lisp/flexi-streams/metadata.xml
index 417d4b8ab7..6523f99a4b 100644
--- a/dev-lisp/flexi-streams/metadata.xml
+++ b/dev-lisp/flexi-streams/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>common-lisp</herd>
@@ -9,4 +9,7 @@
 		encodings which can be changed on the fly. It also supplies
 		in-memory binary streams which are similar to string streams. 
 	</longdescription>
+	<upstream>
+		<remote-id type="github">edicl/flexi-streams</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/batteries/metadata.xml b/dev-ml/batteries/metadata.xml
index 2193d772e3..7c20df751b 100644
--- a/dev-ml/batteries/metadata.xml
+++ b/dev-ml/batteries/metadata.xml
@@ -1,5 +1,8 @@
-<?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>ml</herd>
+	<herd>ml</herd>
+	<upstream>
+		<remote-id type="github">ocaml-batteries-team/batteries-included</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/abstract_rendering/metadata.xml b/dev-python/abstract_rendering/metadata.xml
index ae465cf37e..27bb7d4aa6 100644
--- a/dev-python/abstract_rendering/metadata.xml
+++ b/dev-python/abstract_rendering/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,5 +8,6 @@
       <email>jcottam@indiana.edu</email>
       <name>Joseph Cottam</name>
     </maintainer>
+    <remote-id type="github">ContinuumIO/abstract_rendering</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/blosc/metadata.xml b/dev-python/blosc/metadata.xml
index b6dd93a1ff..94289204f0 100644
--- a/dev-python/blosc/metadata.xml
+++ b/dev-python/blosc/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>sci</herd>
@@ -11,8 +11,9 @@
   with relatively low entropy, like sparse data, time series, grids with
   regular-spaced values, etc.
   python-blosc a Python package that wraps Blosc.
-</longdescription>
+  </longdescription>
   <upstream>
     <remote-id type="pypi">blosc</remote-id>
+    <remote-id type="github">Blosc/python-blosc</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/httpbin/metadata.xml b/dev-python/httpbin/metadata.xml
index b3fab065a5..728f4fb917 100644
--- a/dev-python/httpbin/metadata.xml
+++ b/dev-python/httpbin/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,5 +8,6 @@
       <email>httpbin@runscope.com</email>
       <name>Runscope</name>
     </maintainer>
+    <remote-id type="github">Runscope/httpbin</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/iminuit/metadata.xml b/dev-python/iminuit/metadata.xml
index c98fc1d116..585191b964 100644
--- a/dev-python/iminuit/metadata.xml
+++ b/dev-python/iminuit/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="pypi">iminuit</remote-id>
+    <remote-id type="github">iminuit/iminuit</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/lazy-object-proxy/metadata.xml b/dev-python/lazy-object-proxy/metadata.xml
index 71103e2742..f95d51a6b8 100644
--- a/dev-python/lazy-object-proxy/metadata.xml
+++ b/dev-python/lazy-object-proxy/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,5 +8,6 @@
       <email>contact@ionelmc.ro</email>
       <name>Ionel Cristian Mărieș</name>
     </maintainer>
+    <remote-id type="github">ionelmc/python-lazy-object-proxy</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/markups/metadata.xml b/dev-python/markups/metadata.xml
index b871cab528..4b76285c2e 100644
--- a/dev-python/markups/metadata.xml
+++ b/dev-python/markups/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 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">Markups</remote-id>
+    <remote-id type="github">retext-project/pymarkups</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/memory_profiler/metadata.xml b/dev-python/memory_profiler/metadata.xml
index 86ec95cf04..deca567b07 100644
--- a/dev-python/memory_profiler/metadata.xml
+++ b/dev-python/memory_profiler/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,5 +8,6 @@
       <email>f@bianp.net</email>
       <name>Fabian Pedregosa</name>
     </maintainer>
+    <remote-id type="github">fabianp/memory_profiler</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pycapnp/metadata.xml b/dev-python/pycapnp/metadata.xml
index 33bbf312d5..1c218f0794 100644
--- a/dev-python/pycapnp/metadata.xml
+++ b/dev-python/pycapnp/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>
@@ -7,4 +7,7 @@
     <name>Alexis Ballier</name>
     <description>Python team can take the package if they wish.</description>
   </maintainer>
+  <upstream>
+    <remote-id type="pypi">pycapnp</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-httpbin/metadata.xml b/dev-python/pytest-httpbin/metadata.xml
index 3748c0ca3a..ea414c103a 100644
--- a/dev-python/pytest-httpbin/metadata.xml
+++ b/dev-python/pytest-httpbin/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,5 +8,6 @@
       <email>me@kevinmccarthy.org</email>
       <name>Kevin McCarthy</name>
     </maintainer>
+    <remote-id type="github">kevin1024/pytest-httpbin</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/python-bugzilla/metadata.xml b/dev-python/python-bugzilla/metadata.xml
index 84b639aeb8..183a8ac2cd 100644
--- a/dev-python/python-bugzilla/metadata.xml
+++ b/dev-python/python-bugzilla/metadata.xml
@@ -1,8 +1,12 @@
-<?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>
     <email>dilfridge@gentoo.org</email>
     <name>Andreas K. Huettel</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">python-bugzilla/python-bugzilla</remote-id>
+    <remote-id type="pypi">python-bugzilla</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/pythondialog/metadata.xml b/dev-python/pythondialog/metadata.xml
index fc12076b9b..0e8716fbe1 100644
--- a/dev-python/pythondialog/metadata.xml
+++ b/dev-python/pythondialog/metadata.xml
@@ -1,8 +1,9 @@
-<?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="sourceforge">pythondialog</remote-id>
+		<remote-id type="pypi">python2-pythondialog</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/rpyc/metadata.xml b/dev-python/rpyc/metadata.xml
index f485ab29dd..e9326a75ce 100644
--- a/dev-python/rpyc/metadata.xml
+++ b/dev-python/rpyc/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>
@@ -9,5 +9,6 @@
 	<longdescription>Remote python call</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">rpyc</remote-id>
+		<remote-id type="pypi">rpyc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/statistics/metadata.xml b/dev-python/statistics/metadata.xml
index 48b92cdac4..de7f4df18b 100644
--- a/dev-python/statistics/metadata.xml
+++ b/dev-python/statistics/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,5 +8,6 @@
       <email>stefano@digitalemagine.com</email>
       <name>Stefano Crosta</name>
     </maintainer>
+    <remote-id type="github">digitalemagine/py-statistics</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/urwidtrees/metadata.xml b/dev-python/urwidtrees/metadata.xml
index 09adda987e..c93589bfff 100644
--- a/dev-python/urwidtrees/metadata.xml
+++ b/dev-python/urwidtrees/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>
@@ -9,4 +9,8 @@
 		This is a Widget Container API for the urwid toolkit. It uses a MVC
 		approach and allows to build trees of widgets.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">pazz/urwidtrees</remote-id>
+		<remote-id type="pypi">urwidtrees</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/xonsh/metadata.xml b/dev-python/xonsh/metadata.xml
index b15221c8e0..fbe9e8a50b 100644
--- a/dev-python/xonsh/metadata.xml
+++ b/dev-python/xonsh/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,5 +8,6 @@
       <email>scopatz@gmail.com</email>
       <name>Anthony Scopatz</name>
     </maintainer>
+    <remote-id type="github">scopatz/xonsh</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/zope-component/metadata.xml b/dev-python/zope-component/metadata.xml
index 3be1e82eb3..fb31035f45 100644
--- a/dev-python/zope-component/metadata.xml
+++ b/dev-python/zope-component/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>
@@ -6,4 +6,8 @@
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">zopefoundation/zope.component</remote-id>
+		<remote-id type="pypi">zope.component</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/zope-event/metadata.xml b/dev-python/zope-event/metadata.xml
index 3be1e82eb3..f9df9f1c5f 100644
--- a/dev-python/zope-event/metadata.xml
+++ b/dev-python/zope-event/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>
@@ -6,4 +6,8 @@
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">zopefoundation/zope.event</remote-id>
+		<remote-id type="pypi">zope.event</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rjb/metadata.xml b/dev-ruby/rjb/metadata.xml
index 3258f094e7..1d45f6d2e5 100644
--- a/dev-ruby/rjb/metadata.xml
+++ b/dev-ruby/rjb/metadata.xml
@@ -8,4 +8,7 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="github">arton/rjb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-tex/rubber/metadata.xml b/dev-tex/rubber/metadata.xml
index 21ff3a5384..fdb2383657 100644
--- a/dev-tex/rubber/metadata.xml
+++ b/dev-tex/rubber/metadata.xml
@@ -1,5 +1,8 @@
-<?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>tex</herd>
+	<upstream>
+		<remote-id type="launchpad">rubber</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/checkstyle/metadata.xml b/dev-util/checkstyle/metadata.xml
index d62c88bb40..8992a19157 100644
--- a/dev-util/checkstyle/metadata.xml
+++ b/dev-util/checkstyle/metadata.xml
@@ -1,8 +1,9 @@
-<?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>java</herd>
 	<upstream>
 		<remote-id type="sourceforge">checkstyle</remote-id>
+		<remote-id type="github">checkstyle/checkstyle</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/gtk-update-icon-cache/metadata.xml b/dev-util/gtk-update-icon-cache/metadata.xml
index dd9bec3a3e..f93807a833 100644
--- a/dev-util/gtk-update-icon-cache/metadata.xml
+++ b/dev-util/gtk-update-icon-cache/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>gnome</herd>
@@ -10,4 +10,7 @@
     GTK+ 2 and 3 to co-exist better by extracting the single conflicting
     tool.
   </longdescription>
+  <upstream>
+    <remote-id type="github">EvaSDK/gtk-update-icon-cache</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-util/re2c/metadata.xml b/dev-util/re2c/metadata.xml
index 6c6fa68f2a..461ea18848 100644
--- a/dev-util/re2c/metadata.xml
+++ b/dev-util/re2c/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>
@@ -9,5 +9,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">re2c</remote-id>
+		<remote-id type="github">skvadrik/re2c</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-action/lugaru/metadata.xml b/games-action/lugaru/metadata.xml
index d3c2cc926f..e1217c9fb0 100644
--- a/games-action/lugaru/metadata.xml
+++ b/games-action/lugaru/metadata.xml
@@ -1,5 +1,8 @@
-<?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>games</herd>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="bitbucket">osslugaru/lugaru</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-arcade/supertux/metadata.xml b/games-arcade/supertux/metadata.xml
index 7d3c26756d..d311938e20 100644
--- a/games-arcade/supertux/metadata.xml
+++ b/games-arcade/supertux/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>games</herd>
 	<upstream>
 		<remote-id type="sourceforge">super-tux</remote-id>
+		<remote-id type="github">SuperTux/supertux</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-emulation/sdlmame/metadata.xml b/games-emulation/sdlmame/metadata.xml
index 337843ad91..e6370db44a 100644
--- a/games-emulation/sdlmame/metadata.xml
+++ b/games-emulation/sdlmame/metadata.xml
@@ -1,8 +1,8 @@
-<?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>games</herd>
-<longdescription>
+  <herd>games</herd>
+  <longdescription>
 SDLMAME is a port of the popular MAME[tm]. There are a few principles that guide it's development:
 
 1) run on Linux/Unix, Mac OS X, and other SDL supported operating systems with as few changes as
@@ -15,10 +15,13 @@ encounter it on.
 2) MAME developers are important. By keeping quickly up to date, we make it easy for people on
 non-Windows platforms to make and submit changes to the core MAME code, and we offer native
 implementations of MAME's multi-window GUI debugger on both Linux/Unix and Mac OS X.
-</longdescription>
+  </longdescription>
   <use>
     <flag name="arcade">Enable the Multiple Arcade Machine Emulator for arcade games support</flag>
     <flag name="tools">Build development tools shared between sdlmame and sdlmess</flag>
     <flag name="mess">Enable the Multi Emulator Super System for game system support</flag>
   </use>
+  <upstream>
+    <remote-id type="github">mamedev/mame</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
index b096488874..a0ca5a455f 100644
--- a/mail-client/mutt/metadata.xml
+++ b/mail-client/mutt/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>net-mail</herd>
@@ -16,5 +16,6 @@
   </use>
   <upstream>
     <remote-id type="sourceforge">mutt</remote-id>
+    <remote-id type="bitbucket">mutt/mutt</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/mail-filter/rmilter/metadata.xml b/mail-filter/rmilter/metadata.xml
index 56a1880364..39e6b2ab5c 100644
--- a/mail-filter/rmilter/metadata.xml
+++ b/mail-filter/rmilter/metadata.xml
@@ -1,8 +1,11 @@
-<?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>
     <email>djc@gentoo.org</email>
     <name>Dirkjan Ochtman</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">vstakhov/rmilter</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml
index 56a1880364..bfb2476317 100644
--- a/mail-filter/rspamd/metadata.xml
+++ b/mail-filter/rspamd/metadata.xml
@@ -1,8 +1,11 @@
-<?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>
     <email>djc@gentoo.org</email>
     <name>Dirkjan Ochtman</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">vstakhov/rspamd</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-gfx/k3d/metadata.xml b/media-gfx/k3d/metadata.xml
index 87f8ff1d84..9e499d32cb 100644
--- a/media-gfx/k3d/metadata.xml
+++ b/media-gfx/k3d/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>graphics</herd>
@@ -11,5 +11,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">k3d</remote-id>
+		<remote-id type="github">K-3D/k3d</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/pinta/metadata.xml b/media-gfx/pinta/metadata.xml
index 4f849de642..e34018d377 100644
--- a/media-gfx/pinta/metadata.xml
+++ b/media-gfx/pinta/metadata.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">

-<pkgmetadata>

-	<herd>proxy-maintainers</herd>

-	<maintainer>

-		<email>axelgenus@gmail.com</email>

-		<name>Alessandro Calorì</name>

-		<description>Proxied maintainer; set to assignee in all bugs</description>

-	</maintainer>

-	<upstream>

-		<maintainer status="active">

-			<email>cameronwhite91@gmail.com</email>

-		</maintainer>

-		<changelog>https://github.com/PintaProject/Pinta/commits/1.3</changelog>

-		<doc lang="en">http://pinta-project.com/HowTo.ashx</doc>

-		<bugs-to>https://bugs.launchpad.net/pinta/+filebug</bugs-to>

-	</upstream>

-	<longdescription lang="en">

-		Pinta is a free, open source drawing/editing program modeled after 

-		Paint.NET. Its goal is to provide users with a simple yet powerful

-		way to draw and manipulate images on Linux, Mac, and Windows.

-	</longdescription>

-</pkgmetadata>

+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>axelgenus@gmail.com</email>
+		<name>Alessandro Calorì</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>cameronwhite91@gmail.com</email>
+		</maintainer>
+		<changelog>https://github.com/PintaProject/Pinta/commits/1.3</changelog>
+		<doc lang="en">http://pinta-project.com/HowTo.ashx</doc>
+		<bugs-to>https://bugs.launchpad.net/pinta/+filebug</bugs-to>
+		<remote-id type="github">PintaProject/Pinta</remote-id>
+	</upstream>
+	<longdescription lang="en">
+		Pinta is a free, open source drawing/editing program modeled after 
+		Paint.NET. Its goal is to provide users with a simple yet powerful
+		way to draw and manipulate images on Linux, Mac, and Windows.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-libs/gd/metadata.xml b/media-libs/gd/metadata.xml
index 96855a007e..050294196c 100644
--- a/media-libs/gd/metadata.xml
+++ b/media-libs/gd/metadata.xml
@@ -1,11 +1,11 @@
-<?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>graphics</herd>
-<maintainer>
-	<email>vapier@gentoo.org</email>
-</maintainer>
-<longdescription>
+	<herd>graphics</herd>
+	<maintainer>
+		<email>vapier@gentoo.org</email>
+	</maintainer>
+	<longdescription>
 gd is a graphics library. It allows your code to quickly draw images complete  
 with lines, arcs, text, multiple colors, cut and paste from other images, and
 flood fills, and write out the result as a PNG or JPEG file. This is particularly
@@ -22,12 +22,13 @@ necessary or desirable for gd to become a kitchen-sink graphics package, but
 version 2.0 does include most frequently requested features, including both  
 truecolor and palette images, resampling (smooth resizing of truecolor images)
 and so forth.
-</longdescription>
-<upstream>
-	<remote-id type="github">libgd/libgd</remote-id>
-	<bugs-to>https://github.com/libgd/libgd/issues</bugs-to>
-</upstream>
-<use>
-	<flag name='webp'>Enable support for the webp format</flag>
-</use>
+	</longdescription>
+	<upstream>
+		<remote-id type="github">libgd/libgd</remote-id>
+		<bugs-to>https://github.com/libgd/libgd/issues</bugs-to>
+		<remote-id type="bitbucket">libgd/gd-libgd</remote-id>
+	</upstream>
+	<use>
+		<flag name="webp">Enable support for the webp format</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/musescore/metadata.xml b/media-sound/musescore/metadata.xml
index 2db48a7c91..2e93e3987a 100644
--- a/media-sound/musescore/metadata.xml
+++ b/media-sound/musescore/metadata.xml
@@ -1,8 +1,9 @@
-<?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>sound</herd>
 	<upstream>
 		<remote-id type="sourceforge">mscore</remote-id>
+		<remote-id type="github">musescore/MuseScore</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/ripe-atlas-tools/metadata.xml b/net-analyzer/ripe-atlas-tools/metadata.xml
index 46c572635b..ceaef6d0a0 100644
--- a/net-analyzer/ripe-atlas-tools/metadata.xml
+++ b/net-analyzer/ripe-atlas-tools/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>proxy-maintainers</herd>
@@ -7,4 +7,7 @@
 		<name>Daniel Quinn</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ripe.atlas.tools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-irc/kvirc/metadata.xml b/net-irc/kvirc/metadata.xml
index 535a6e6a33..2d09bff03e 100644
--- a/net-irc/kvirc/metadata.xml
+++ b/net-irc/kvirc/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>
@@ -13,4 +13,7 @@
 		<flag name="phonon">Support Phonon for audio output</flag>
 		<flag name="transparency">Support pseudo-transparency</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">kvirc/KVIrc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/librsync/metadata.xml b/net-libs/librsync/metadata.xml
index 9abf8849ea..f9c39470f4 100644
--- a/net-libs/librsync/metadata.xml
+++ b/net-libs/librsync/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>proxy-maintainers</herd>
@@ -9,5 +9,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">librsync</remote-id>
+		<remote-id type="github">librsync/librsync</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-libs/ripe-atlas-sagan/metadata.xml b/net-libs/ripe-atlas-sagan/metadata.xml
index 46c572635b..5f5dcbc435 100644
--- a/net-libs/ripe-atlas-sagan/metadata.xml
+++ b/net-libs/ripe-atlas-sagan/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>proxy-maintainers</herd>
@@ -7,4 +7,7 @@
 		<name>Daniel Quinn</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ripe.atlas.sagan</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/aria2/metadata.xml b/net-misc/aria2/metadata.xml
index 605a48a66e..d1101e9786 100644
--- a/net-misc/aria2/metadata.xml
+++ b/net-misc/aria2/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>
@@ -21,5 +21,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">aria2</remote-id>
+		<remote-id type="github">tatsuhiro-t/aria2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-nntp/nzbget/metadata.xml b/net-nntp/nzbget/metadata.xml
index 566bb478f4..02b27e1aa0 100644
--- a/net-nntp/nzbget/metadata.xml
+++ b/net-nntp/nzbget/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>net-news</herd>
@@ -12,5 +12,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">nzbget</remote-id>
+		<remote-id type="github">nzbget/nzbget</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sci-biology/biopandas/metadata.xml b/sci-biology/biopandas/metadata.xml
index a58f7c576b..9924f08b21 100644
--- a/sci-biology/biopandas/metadata.xml
+++ b/sci-biology/biopandas/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>sci-biology</herd>
@@ -8,5 +8,6 @@
       <email>mail@sebastianraschka.com</email>
       <name>Sebastian Raschka</name>
     </maintainer>
+    <remote-id type="github">rasbt/biopandas</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-chemistry/gperiodic/metadata.xml b/sci-chemistry/gperiodic/metadata.xml
index e87a875983..4d968901f0 100644
--- a/sci-chemistry/gperiodic/metadata.xml
+++ b/sci-chemistry/gperiodic/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>sci-chemistry</herd>
@@ -6,5 +6,8 @@
     GPeriodic is a program for looking up various data about elements from the
     periodic table, based on the GTK2 toolkit. It also features a command line
     interface.
-  </longdescription>
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">downloads</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-chemistry/molequeue/metadata.xml b/sci-chemistry/molequeue/metadata.xml
index e7326743bc..3799f5bf3f 100644
--- a/sci-chemistry/molequeue/metadata.xml
+++ b/sci-chemistry/molequeue/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>sci</herd>
@@ -14,7 +14,7 @@ Mac OS X and Windows. Users can set up local and remote queues that describe
 where the task will be executed. Each queue can have programs, with templates 
 to facilitate the execution of the program. Input files can be staged, and 
 output files collected using a standard interface.
-</longdescription>
+  </longdescription>
   <use>
     <flag name="zeromq">Build with <pkg>net-libs/zeromq</pkg> support</flag>
     <flag name="client">Build the client application</flag>
@@ -22,5 +22,6 @@ output files collected using a standard interface.
   </use>
   <upstream>
     <remote-id type="sourceforge">molequeue</remote-id>
+    <remote-id type="github">OpenChemistry/molequeue</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sys-apps/firejail/metadata.xml b/sys-apps/firejail/metadata.xml
index 351bca0ffd..7198188ba7 100644
--- a/sys-apps/firejail/metadata.xml
+++ b/sys-apps/firejail/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>
@@ -13,4 +13,7 @@
 		kernel resources, such as the network stack, process table, mount
 		table.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">firejail</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/openrc/metadata.xml b/sys-apps/openrc/metadata.xml
index 00439362b4..a146c17980 100644
--- a/sys-apps/openrc/metadata.xml
+++ b/sys-apps/openrc/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>openrc</herd>
@@ -7,4 +7,7 @@
 		<flag name="newnet">enable the new network stack (experimental)</flag>
 		<flag name="tools">build optional tools</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">openrc/openrc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/xinetd/metadata.xml b/sys-apps/xinetd/metadata.xml
index 9935eeda14..189b8749da 100644
--- a/sys-apps/xinetd/metadata.xml
+++ b/sys-apps/xinetd/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<use>
-	<flag name='rpc'>support RPC services</flag>
-</use>
+	<herd>base-system</herd>
+	<use>
+		<flag name="rpc">support RPC services</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">xinetd-org/xinetd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-client/ripe-atlas-cousteau/metadata.xml b/www-client/ripe-atlas-cousteau/metadata.xml
index 46c572635b..bcaec783d9 100644
--- a/www-client/ripe-atlas-cousteau/metadata.xml
+++ b/www-client/ripe-atlas-cousteau/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>proxy-maintainers</herd>
@@ -7,4 +7,7 @@
 		<name>Daniel Quinn</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ripe.atlas.cousteau</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/quitcount/metadata.xml b/x11-misc/quitcount/metadata.xml
index e275ac63ae..88c4ea340c 100644
--- a/x11-misc/quitcount/metadata.xml
+++ b/x11-misc/quitcount/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>proxy-maintainers</herd>
@@ -7,4 +7,7 @@
 		<name>laurent@lamzi.com</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">quitcount</remote-id>
+	</upstream>
 </pkgmetadata>