diff --git a/app-admin/longrun/metadata.xml b/app-admin/longrun/metadata.xml
index 571b8a2a562fa..5e882ed16b130 100644
--- a/app-admin/longrun/metadata.xml
+++ b/app-admin/longrun/metadata.xml
@@ -7,7 +7,4 @@
 		thermal and power save functionalities found in the processors made
 		by Transmeta.
 	</longdescription>
-	<upstream>
-		<remote-id type="freshmeat">longrun</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/app-admin/watchfolder/metadata.xml b/app-admin/watchfolder/metadata.xml
index 5110520fa1d3b..115e9d64a6695 100644
--- a/app-admin/watchfolder/metadata.xml
+++ b/app-admin/watchfolder/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="freshmeat">watchd</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/app-arch/afio/metadata.xml b/app-arch/afio/metadata.xml
index e87efba35be19..b18457cad81fb 100644
--- a/app-arch/afio/metadata.xml
+++ b/app-arch/afio/metadata.xml
@@ -9,7 +9,4 @@
 		tar or cpio archives. Afio is best used as an 'archive engine' in a backup
 		script.
 	</longdescription>
-	<upstream>
-		<remote-id type="freshmeat">afio</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/app-misc/dvorakng/metadata.xml b/app-misc/dvorakng/metadata.xml
index fa2cd7596c288..115e9d64a6695 100644
--- a/app-misc/dvorakng/metadata.xml
+++ b/app-misc/dvorakng/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="freshmeat">dvorakng</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/app-misc/esekeyd/metadata.xml b/app-misc/esekeyd/metadata.xml
index 399723ab2679e..115e9d64a6695 100644
--- a/app-misc/esekeyd/metadata.xml
+++ b/app-misc/esekeyd/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="freshmeat">esekeyd</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/app-misc/jot/metadata.xml b/app-misc/jot/metadata.xml
index d319ae32fa441..6258504e5133a 100644
--- a/app-misc/jot/metadata.xml
+++ b/app-misc/jot/metadata.xml
@@ -5,7 +5,4 @@
 		<email>shell-tools@gentoo.org</email>
 		<name>Gentoo Shell Tools Project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="freshmeat">bsd-jot</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/games-arcade/pengupop/metadata.xml b/games-arcade/pengupop/metadata.xml
index c0074924de445..7c730d47817a3 100644
--- a/games-arcade/pengupop/metadata.xml
+++ b/games-arcade/pengupop/metadata.xml
@@ -5,7 +5,4 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="freshmeat">pengupop</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/games-arcade/spout/metadata.xml b/games-arcade/spout/metadata.xml
index 91325b3c4effa..7c730d47817a3 100644
--- a/games-arcade/spout/metadata.xml
+++ b/games-arcade/spout/metadata.xml
@@ -5,7 +5,4 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="freshmeat">spout</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/games-arcade/yarsrevenge/metadata.xml b/games-arcade/yarsrevenge/metadata.xml
index c6adac0a3600b..40ca8a9757f82 100644
--- a/games-arcade/yarsrevenge/metadata.xml
+++ b/games-arcade/yarsrevenge/metadata.xml
@@ -9,7 +9,4 @@
 A rather weird shoot-em-up game that originated on the Atari 2600. It's more
 fun than it looks. Just released so might be tweaked.
 </longdescription>
-	<upstream>
-		<remote-id type="freshmeat">yarsrevenge</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/games-board/xscrabble/metadata.xml b/games-board/xscrabble/metadata.xml
index df2786e820bfd..7c730d47817a3 100644
--- a/games-board/xscrabble/metadata.xml
+++ b/games-board/xscrabble/metadata.xml
@@ -5,7 +5,4 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="freshmeat">xscrabble</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/crwinfo/metadata.xml b/media-gfx/crwinfo/metadata.xml
index 3e95afc97794b..115e9d64a6695 100644
--- a/media-gfx/crwinfo/metadata.xml
+++ b/media-gfx/crwinfo/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="freshmeat">crwinfo</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/media-libs/libjsw/metadata.xml b/media-libs/libjsw/metadata.xml
index 4031972af8bb9..7c730d47817a3 100644
--- a/media-libs/libjsw/metadata.xml
+++ b/media-libs/libjsw/metadata.xml
@@ -5,7 +5,4 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="freshmeat">libjsw</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/media-sound/SmarTagger/metadata.xml b/media-sound/SmarTagger/metadata.xml
index 2bfbd694bd582..93423219a5bca 100644
--- a/media-sound/SmarTagger/metadata.xml
+++ b/media-sound/SmarTagger/metadata.xml
@@ -5,7 +5,4 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="freshmeat">smartagger</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/media-sound/taginfo/metadata.xml b/media-sound/taginfo/metadata.xml
index 6f3b074c937a7..93423219a5bca 100644
--- a/media-sound/taginfo/metadata.xml
+++ b/media-sound/taginfo/metadata.xml
@@ -5,7 +5,4 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="freshmeat">taginfo</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/sys-auth/pam_skey/metadata.xml b/sys-auth/pam_skey/metadata.xml
index f24f616301586..f520e8983b280 100644
--- a/sys-auth/pam_skey/metadata.xml
+++ b/sys-auth/pam_skey/metadata.xml
@@ -4,7 +4,4 @@
   <maintainer type="person">
     <email>ulm@gentoo.org</email>
   </maintainer>
-  <upstream>
-    <remote-id type="freshmeat">pam_skey</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/peksystray/metadata.xml b/x11-misc/peksystray/metadata.xml
index 20fad93206f2a..786486b128daa 100644
--- a/x11-misc/peksystray/metadata.xml
+++ b/x11-misc/peksystray/metadata.xml
@@ -4,6 +4,5 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">peksystray</remote-id>
-		<remote-id type="freshmeat">peksystray</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-plugins/wmblob/metadata.xml b/x11-plugins/wmblob/metadata.xml
index 0ff962f909a3b..8a473e90e0260 100644
--- a/x11-plugins/wmblob/metadata.xml
+++ b/x11-plugins/wmblob/metadata.xml
@@ -5,7 +5,4 @@
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="freshmeat">wmblob</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/x11-plugins/wmnetload/metadata.xml b/x11-plugins/wmnetload/metadata.xml
index b86cbf3cb450e..cd9959ef1348a 100644
--- a/x11-plugins/wmnetload/metadata.xml
+++ b/x11-plugins/wmnetload/metadata.xml
@@ -13,7 +13,4 @@ throughput, along with an auto-scaling graph of recent network activity (the
 graph separates upstream and downstream traffic load cleanly without resorting 
 to colors).
 </longdescription>
-	<upstream>
-		<remote-id type="freshmeat">wmnetload</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/x11-themes/experience/metadata.xml b/x11-themes/experience/metadata.xml
index 623c0d2400731..f453528b934fe 100644
--- a/x11-themes/experience/metadata.xml
+++ b/x11-themes/experience/metadata.xml
@@ -5,7 +5,4 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="freshmeat">experience</remote-id>
-	</upstream>
 </pkgmetadata>