diff --git a/app-text/yodl/metadata.xml b/app-text/yodl/metadata.xml
index b7354134ca260..771431d0502b5 100644
--- a/app-text/yodl/metadata.xml
+++ b/app-text/yodl/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">yodl</remote-id>
+		<remote-id type="github">fbb-git/yodl</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/catkin_pkg/metadata.xml b/dev-python/catkin_pkg/metadata.xml
index c42ea5b15cf63..8271309233bd1 100644
--- a/dev-python/catkin_pkg/metadata.xml
+++ b/dev-python/catkin_pkg/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>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-infrastructure/catkin_pkg</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django-grappelli/metadata.xml b/dev-python/django-grappelli/metadata.xml
index cdf82d15f5532..df9d7ace36b6f 100644
--- a/dev-python/django-grappelli/metadata.xml
+++ b/dev-python/django-grappelli/metadata.xml
@@ -6,4 +6,7 @@
 		<email>jlec@gentoo.org</email>
 		<name>Justin Lecher</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-grappelli</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python_orocos_kdl/metadata.xml b/dev-python/python_orocos_kdl/metadata.xml
index c42ea5b15cf63..e484e59e950b7 100644
--- a/dev-python/python_orocos_kdl/metadata.xml
+++ b/dev-python/python_orocos_kdl/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>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">orocos/orocos_kinematics_dynamics</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/rosdistro/metadata.xml b/dev-python/rosdistro/metadata.xml
index c42ea5b15cf63..0a799247b03d0 100644
--- a/dev-python/rosdistro/metadata.xml
+++ b/dev-python/rosdistro/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>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-infrastructure/rosdistro</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/rospkg/metadata.xml b/dev-python/rospkg/metadata.xml
index c42ea5b15cf63..02ab2c759bcc1 100644
--- a/dev-python/rospkg/metadata.xml
+++ b/dev-python/rospkg/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>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-infrastructure/rospkg</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/vcstools/metadata.xml b/dev-python/vcstools/metadata.xml
index c42ea5b15cf63..b43530749bcc3 100644
--- a/dev-python/vcstools/metadata.xml
+++ b/dev-python/vcstools/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>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">vcstools/vcstools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/catkin/metadata.xml b/dev-util/catkin/metadata.xml
index c42ea5b15cf63..4534eeb6a4395 100644
--- a/dev-util/catkin/metadata.xml
+++ b/dev-util/catkin/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>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/catkin</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/icmake/metadata.xml b/dev-util/icmake/metadata.xml
index ecd992c3b2c48..ad041907d8806 100644
--- a/dev-util/icmake/metadata.xml
+++ b/dev-util/icmake/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">icmake</remote-id>
+		<remote-id type="github">fbb-git/icmake</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/rosdep/metadata.xml b/dev-util/rosdep/metadata.xml
index c42ea5b15cf63..a337e79e8c737 100644
--- a/dev-util/rosdep/metadata.xml
+++ b/dev-util/rosdep/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>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-infrastructure/rosdep</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/rosinstall/metadata.xml b/dev-util/rosinstall/metadata.xml
index c42ea5b15cf63..22272a81ac890 100644
--- a/dev-util/rosinstall/metadata.xml
+++ b/dev-util/rosinstall/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>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">vcstools/rosinstall</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/rosinstall_generator/metadata.xml b/dev-util/rosinstall_generator/metadata.xml
index c42ea5b15cf63..e4e50ba004c26 100644
--- a/dev-util/rosinstall_generator/metadata.xml
+++ b/dev-util/rosinstall_generator/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>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-infrastructure/rosinstall_generator</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/wstool/metadata.xml b/dev-util/wstool/metadata.xml
index c42ea5b15cf63..fd3fa9a0ad5e1 100644
--- a/dev-util/wstool/metadata.xml
+++ b/dev-util/wstool/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>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">vcstools/wstool</remote-id>
+	</upstream>
 </pkgmetadata>