diff --git a/app-admin/gtkdiskfree/metadata.xml b/app-admin/gtkdiskfree/metadata.xml
index 4c8d1bcd96193..e042f09cf1ed0 100644
--- a/app-admin/gtkdiskfree/metadata.xml
+++ b/app-admin/gtkdiskfree/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>
@@ -12,8 +12,5 @@
 	</maintainer>
 	<longdescription>
 gtkdiskfree is a gtk extension to the cli tool df, does the same and more
-</longdescription>
-	<upstream>
-		<remote-id type="gitorious">gtkdiskfree</remote-id>
-	</upstream>
+	</longdescription>
 </pkgmetadata>
diff --git a/app-arch/deltarpm/metadata.xml b/app-arch/deltarpm/metadata.xml
index 24ef88ea5b33d..f7ce1ce737b05 100644
--- a/app-arch/deltarpm/metadata.xml
+++ b/app-arch/deltarpm/metadata.xml
@@ -1,11 +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>
 	<maintainer>
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 	<longdescription>A tool to create and apply deltarpms.</longdescription>
-	<upstream>
-		<remote-id type="gitorious">deltarpm/deltarpm</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/app-emacs/evil/metadata.xml b/app-emacs/evil/metadata.xml
index bebc85a15a5bb..4182a42c03c0e 100644
--- a/app-emacs/evil/metadata.xml
+++ b/app-emacs/evil/metadata.xml
@@ -1,8 +1,5 @@
-<?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>emacs</herd>
-<upstream>
-  <remote-id type="gitorious">evil</remote-id>
-</upstream>
+  <herd>emacs</herd>
 </pkgmetadata>
diff --git a/app-emacs/pov-mode/metadata.xml b/app-emacs/pov-mode/metadata.xml
index f09c9defae460..4182a42c03c0e 100644
--- a/app-emacs/pov-mode/metadata.xml
+++ b/app-emacs/pov-mode/metadata.xml
@@ -1,8 +1,5 @@
-<?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>emacs</herd>
-<upstream>
-  <remote-id type="gitorious">pov-mode</remote-id>
-</upstream>
+  <herd>emacs</herd>
 </pkgmetadata>
diff --git a/app-i18n/enca/metadata.xml b/app-i18n/enca/metadata.xml
index d10f1bc6bc1c4..e42fda9f55605 100644
--- a/app-i18n/enca/metadata.xml
+++ b/app-i18n/enca/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>
@@ -11,7 +11,4 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="gitorious">enca</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/uri/metadata.xml b/dev-haskell/uri/metadata.xml
index 2d26feb0e5bb1..efb9b1227fa27 100644
--- a/dev-haskell/uri/metadata.xml
+++ b/dev-haskell/uri/metadata.xml
@@ -1,11 +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>haskell</herd>
 	<longdescription>
 		Library for working with URIs, including parsing, rendering, merging, escaping
 	</longdescription>
-	<upstream>
-		<remote-id type="gitorious">uri</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-python/async/metadata.xml b/dev-python/async/metadata.xml
index 6dff7db3370cb..71f6c3050f43e 100644
--- a/dev-python/async/metadata.xml
+++ b/dev-python/async/metadata.xml
@@ -1,9 +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>python</herd>
 	<upstream>
 		<remote-id type="pypi">async</remote-id>
-		<remote-id type="gitorious">git-python/async</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/git-python/metadata.xml b/dev-python/git-python/metadata.xml
index 5a31bf726ce57..690b57f0a6bf3 100644
--- a/dev-python/git-python/metadata.xml
+++ b/dev-python/git-python/metadata.xml
@@ -1,9 +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>python</herd>
 	<upstream>
 		<remote-id type="pypi">GitPython</remote-id>
-		<remote-id type="gitorious">git-python</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-vaapi/metadata.xml b/media-plugins/gst-plugins-vaapi/metadata.xml
index 6552820010a8a..6fef50822a377 100644
--- a/media-plugins/gst-plugins-vaapi/metadata.xml
+++ b/media-plugins/gst-plugins-vaapi/metadata.xml
@@ -1,11 +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>gstreamer</herd>
 	<use>
 		<flag name="drm">Enable DRM renderer</flag>
 	</use>
-	<upstream>
-		<remote-id type="gitorious">vaapi/gstreamer-vaapi</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/net-im/dianara/metadata.xml b/net-im/dianara/metadata.xml
index 9a53b08c0ed6f..27e2dbc5d6123 100644
--- a/net-im/dianara/metadata.xml
+++ b/net-im/dianara/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,5 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://savannah.nongnu.org/bugs/?group=dianara</bugs-to>
-		<remote-id type="gitorious">dianara</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/spice-gtk/metadata.xml b/net-misc/spice-gtk/metadata.xml
index ef05c1f54b7e0..0cc04d7534d6f 100644
--- a/net-misc/spice-gtk/metadata.xml
+++ b/net-misc/spice-gtk/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>virtualization</herd>
@@ -21,7 +21,4 @@
     <flag name="webdav">Support for folder-sharing between guest and client
 		using <pkg>net-libs/phodav</pkg></flag>
   </use>
-  <upstream>
-    <remote-id type="gitorious">spice-gtk</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/net-nntp/kwooty/metadata.xml b/net-nntp/kwooty/metadata.xml
index 2cf8d86933557..4ddb71d1fec66 100644
--- a/net-nntp/kwooty/metadata.xml
+++ b/net-nntp/kwooty/metadata.xml
@@ -1,11 +1,10 @@
-<?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>kde</herd>
 	<herd>net-news</herd>
 	<upstream>
 		<remote-id type="sourceforge">kwooty</remote-id>
-		<remote-id type="gitorious">kwooty</remote-id>
 		<bugs-to>http://sourceforge.net/tracker/?group_id=285032</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/sci-electronics/osqoop/metadata.xml b/sci-electronics/osqoop/metadata.xml
index 30ddc705c81dc..8a5068513dacf 100644
--- a/sci-electronics/osqoop/metadata.xml
+++ b/sci-electronics/osqoop/metadata.xml
@@ -1,11 +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>
 	<maintainer>
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="gitorious">osqoop</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/sys-auth/oath-toolkit/metadata.xml b/sys-auth/oath-toolkit/metadata.xml
index d184566c48960..bed671b33c6c5 100644
--- a/sys-auth/oath-toolkit/metadata.xml
+++ b/sys-auth/oath-toolkit/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,7 +9,4 @@
 		<flag name="pskc">Build tools &amp; library for the Portable Symmetric Key Container (PSKC) format per RFC6030</flag>
 		<flag name="pam">Build PAM module for pluggable login authentication for OATH</flag>
 	</use>
-	<upstream>
-		<remote-id type="gitorious">oath-toolkit</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/set_opacity/metadata.xml b/x11-misc/set_opacity/metadata.xml
index 57147d064d198..5653aafc77107 100644
--- a/x11-misc/set_opacity/metadata.xml
+++ b/x11-misc/set_opacity/metadata.xml
@@ -1,11 +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>
   <maintainer>
     <email>pinkbyte@gentoo.org</email>
     <name>Sergey Popov</name>
   </maintainer>
-  <upstream>
-    <remote-id type="gitorious">x11-tools/set_opacity</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/x11-terms/valaterm/metadata.xml b/x11-terms/valaterm/metadata.xml
index 2a3ba4a1c0323..98bcbae11ede9 100644
--- a/x11-terms/valaterm/metadata.xml
+++ b/x11-terms/valaterm/metadata.xml
@@ -1,11 +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>
   <maintainer>
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
   </maintainer>
-  <upstream>
-    <remote-id type="gitorious">valaterm</remote-id>
-  </upstream>
 </pkgmetadata>