diff --git a/app-doc/zeal/metadata.xml b/app-doc/zeal/metadata.xml
index 2bd4212e4bc93..f5d677e81209e 100644
--- a/app-doc/zeal/metadata.xml
+++ b/app-doc/zeal/metadata.xml
@@ -6,4 +6,7 @@
     <name>Ole Reifschneider</name>
     <description>Offline documentation browser inspired by Dash</description>
   </maintainer>
+  <upstream>
+    <remote-id type="github">zealdocs/zeal</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-haskell/hdbc-sqlite/metadata.xml b/dev-haskell/hdbc-sqlite/metadata.xml
index 179f158559e45..0ef35d2796f64 100644
--- a/dev-haskell/hdbc-sqlite/metadata.xml
+++ b/dev-haskell/hdbc-sqlite/metadata.xml
@@ -6,4 +6,7 @@
 		This is the Sqlite v3 driver for HDBC, the generic
 		database access system for Haskell
 	</longdescription>
+	<upstream>
+		<remote-id type="github">hdbc/hdbc-sqlite3</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/mtl-compat/metadata.xml b/dev-haskell/mtl-compat/metadata.xml
index 95fbdda5c9460..79e859ca50a5a 100644
--- a/dev-haskell/mtl-compat/metadata.xml
+++ b/dev-haskell/mtl-compat/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>haskell</herd>
 	<longdescription>
-		This package backports the &quot;Control.Monad.Except&quot; module from
+		This package backports the "Control.Monad.Except" module from
 		@mtl@ (if using @mtl-2.2.0.1@ or earlier), which reexports the
 		@ExceptT@ monad transformer and the @MonadError@ class.
 		
@@ -14,9 +14,12 @@
 		but reexport the instances from that package.
 		
 		Note that unlike how @mtl-2.2@ or later works, the
-		&quot;Control.Monad.Except&quot; module defined in this package exports
-		all of @ExceptT@&#39;s monad class instances. Therefore, you may
+		"Control.Monad.Except" module defined in this package exports
+		all of @ExceptT@'s monad class instances. Therefore, you may
 		have to declare @import Control.Monad.Except ()@ at the top of
 		your file to get all of the @ExceptT@ instances in scope.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">RyanGlScott/mtl-compat</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/treelayout/metadata.xml b/dev-java/treelayout/metadata.xml
index c3c6a2eb6e3a9..aed73cb016440 100644
--- a/dev-java/treelayout/metadata.xml
+++ b/dev-java/treelayout/metadata.xml
@@ -3,4 +3,7 @@
 <pkgmetadata>
 	<herd>java</herd>
 	<longdescription>The TreeLayout creates tree layouts for arbitrary trees. It is not restricted to a specific output or format, but can be used for any kind of two dimensional diagram. Examples are Swing based components, SVG files, and many more. This is possible because TreeLayout separates the layout of a tree from the actual rendering.</longdescription>
+	<upstream>
+		<remote-id type="github">abego/treelayout</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django-grappelli/metadata.xml b/dev-python/django-grappelli/metadata.xml
index df9d7ace36b6f..ec13a42c7a1fd 100644
--- a/dev-python/django-grappelli/metadata.xml
+++ b/dev-python/django-grappelli/metadata.xml
@@ -8,5 +8,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">django-grappelli</remote-id>
+		<remote-id type="github">sehmaschine/django-grappelli</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/manuel/metadata.xml b/dev-python/manuel/metadata.xml
index b811e3f692abc..4d89e2cd6f399 100644
--- a/dev-python/manuel/metadata.xml
+++ b/dev-python/manuel/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="github">benji-york/manuel</remote-id>
+    <remote-id type="pypi">manuel</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-cov/metadata.xml b/dev-python/pytest-cov/metadata.xml
index 6f652477d0985..ba717655d7efd 100644
--- a/dev-python/pytest-cov/metadata.xml
+++ b/dev-python/pytest-cov/metadata.xml
@@ -8,5 +8,6 @@
   <upstream>
     <remote-id type="pypi">pytest-cov</remote-id>
     <remote-id type="bitbucket">memedough/pytest-cov</remote-id>
+    <remote-id type="github">pytest-dev/pytest-cov</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/regendoc/metadata.xml b/dev-python/regendoc/metadata.xml
index 3181c2c8b4ad1..0fda211cdadc4 100644
--- a/dev-python/regendoc/metadata.xml
+++ b/dev-python/regendoc/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">pip</remote-id>
+    <remote-id type="bitbucket">pytest-dev/regendoc</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/testfixtures/metadata.xml b/dev-python/testfixtures/metadata.xml
index 740a54631c127..9a65a534442b8 100644
--- a/dev-python/testfixtures/metadata.xml
+++ b/dev-python/testfixtures/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">testfixtures</remote-id>
+    <remote-id type="github">Simplistix/testfixtures</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-gfx/gimmage/metadata.xml b/media-gfx/gimmage/metadata.xml
index d44388b7a8e80..80e97c37d4786 100644
--- a/media-gfx/gimmage/metadata.xml
+++ b/media-gfx/gimmage/metadata.xml
@@ -5,4 +5,7 @@
 	<longdescription lang="en">
 		gimmage: the gtkmm image viewer
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">gimmage.berlios</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/gimmix/metadata.xml b/media-sound/gimmix/metadata.xml
index 55888bda00126..43d99907214ae 100644
--- a/media-sound/gimmix/metadata.xml
+++ b/media-sound/gimmix/metadata.xml
@@ -7,8 +7,10 @@
 		<name>Christoph Mende</name>
 	</maintainer>
 	<use>
-		<flag name='cover'>Enable cover art fetching</flag>
-		<flag name='lyrics'>Enable lyric fetching</flag>
+		<flag name="cover">Enable cover art fetching</flag>
+		<flag name="lyrics">Enable lyric fetching</flag>
 	</use>
+	<upstream>
+		<remote-id type="launchpad">gimmix</remote-id>
+	</upstream>
 </pkgmetadata>
-