19 files changed, 66 insertions, 39 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index a96c014ab6aa..5a15704e7b65 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index 7c1252bbe866..16ffa6858b9b 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -17,4 +17,4 @@ AUX a2ps-4.14-texinfo-6.7-encoding.patch 1372 BLAKE2B 3eb51e4c83e60f7073c4957963
 DIST a2ps-4.14-ja_nls.patch.gz 27576 BLAKE2B 7300971fb76f6c8d2b0e5ffa519cf6064519a33f24430b9894e43778dff5b78f7cf7e2b9fe1e98fb475f452b39ccc29f88f579bbe1922ac3ef70775a05591b32 SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f
 DIST a2ps-4.14.tar.gz 2552507 BLAKE2B cd15a2b85f54f8bfb92adf9f4cf2c3c29091e528ae8072d0e905c58cc94caf55b76ac3e37891f8a0bc0909a177c5ee434fe5aaab3625a2c14127dabad8b506ed SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f
 EBUILD a2ps-4.14-r7.ebuild 3608 BLAKE2B 4cd8a24759e611dbb1cc213ebc8587154f844300a15d134b51bc26acc3e8baf26f624fe60b75d35c40f99813a32a6b5e3bf2f2ecf09ac405a192f8748b6b0901 SHA512 98130fdec528347fca365d35df2a455b8fb2986ffb22648cda7ae09d12c6a4c7a22ef1dbe500bdacdb3e9b6751d7d92a8e5d5a7eca423dfe3d789a2eb8d58314
-MISC metadata.xml 347 BLAKE2B 252d70af1bcfb8685137113cd50913be3154245eeac5cad0d719283c87b81af57a48268df9659968f98b4b1e77be16bf4b1af45cc69fd12c8cdbbe8432d4cb49 SHA512 dde37464c0674ff27febf9293b3ea71272d307ae3a61c7a243f8a61ec4283b004cb5496d121aa25dc143f0664bdb212b294dd471c7c10daa9f2f3f0fe5cdc319
+MISC metadata.xml 442 BLAKE2B 89796eb65cfc9ab8929511f94655a9c7f6a39837f5c1cfb0f8885a29d3900512e6c3ee6b44f3ee8e23eca54112f72c7462d4fb223109fdea3d203d5ff4492252 SHA512 078d824c815b9cc0c5a0acfea6f8c5203eb3f1e94778987137181f987cbeaab0040389b0e34cda160d6a3c6f00508c39a6c30404b89dfe64782db1980c9340b7
diff --git a/app-text/a2ps/metadata.xml b/app-text/a2ps/metadata.xml
index 834aba280f85..d22cb76bd2a2 100644
--- a/app-text/a2ps/metadata.xml
+++ b/app-text/a2ps/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>printing@gentoo.org</email>
-	<name>Gentoo Printing Project</name>
-</maintainer>
-<maintainer type="project">
-	<email>cjk@gentoo.org</email>
-	<name>Cjk</name>
-</maintainer>
+  <maintainer type="project">
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">a2ps</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index 38cffbb74313..fc2dc46d7477 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -6,4 +6,4 @@ AUX aspell-0.60.6.1-unicode.patch 8273 BLAKE2B ceadde03ffb1904e58c76074444013d25
 AUX aspell-0.60.8-cve-2019-25051.patch 2880 BLAKE2B b181caf27feae7eae908c92496a5f05f7e7f1f1a089c460b757c2f745b97f5339d4c8e13cf851e704cff7952c5dcd5ad0a8496ec1ae45c1e83fb1fa577134c63 SHA512 529f3f4737d2e19f7571f4c8666b1cd089cc4e9dfdaa52dc468919f01ce9f8f8112d8fe8afda295b3dfb92f5e0c2bbd79bf1ec69f06c163c32eb28f0168ab263
 DIST aspell-0.60.8.tar.gz 3486448 BLAKE2B a72e70af65749059a576740377f93b20ab283f73fa7919894f6af189b5aa73581fa0410800851c9396e7d13f4cbc2f7edc23c53d46874d0389ffdb2432ff08c2 SHA512 8ef4952c553b6234dfe777240d2d97beb13ef9201e18d56bee3b5068d13525db3625b7130d9f5122f7c529da0ccb0c70eb852a81472a7d15fb7c4ee5ba21cd29
 EBUILD aspell-0.60.8-r4.ebuild 2843 BLAKE2B 78c523c1de07f802e43a33230ef9670f3a01c9810277ca8385f6eedbdbe719c912d918dc8c30612920894f597381f15444252d516798f781d2f935894cb6fa93 SHA512 dfb017d41b2f13a75ba839eb6fcb3697964b8f115c4016fdd9cbeb79651a74a52bbe0904e6f2180b8308a1c5bc558aee87019b036e3f78698b9d03a3cd73eaa9
-MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
+MISC metadata.xml 334 BLAKE2B 21076177b3c8b9885a962e3b809ac5dbd0499a32cd9dd8c2a656fc2f98a2ee17dd605890dd36b4567e9adda542762f4031cd53e4b72c67f712a8a8a015541504 SHA512 698c5fc0cb978c79d99db139581aad79016445eb0edae71b604792127d0a7c1e6c40f614df0afbad154ff0402cbf5685a1949ebf7fc5163b2298b05430c9d0ac
diff --git a/app-text/aspell/metadata.xml b/app-text/aspell/metadata.xml
index c07e13d4a6bd..7a5d43ec3623 100644
--- a/app-text/aspell/metadata.xml
+++ b/app-text/aspell/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>conikost@gentoo.org</email>
-		<name>Conrad Kostecki</name>
-	</maintainer>
+  <maintainer type="person">
+    <email>conikost@gentoo.org</email>
+    <name>Conrad Kostecki</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">aspell</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/barcode/Manifest b/app-text/barcode/Manifest
index 9e783f5012b4..b36618db5f88 100644
--- a/app-text/barcode/Manifest
+++ b/app-text/barcode/Manifest
@@ -2,4 +2,4 @@ AUX barcode-0.99-fno-common.patch 650 BLAKE2B 27fce20565dfa526b4240c5817ab45735b
 AUX barcode-0.99-install-static-lib.patch 331 BLAKE2B 72b6a5a31ce3c450587ae7603f802bdd9e8c467f9095538fb819f2742703be1abe749af7faf340f908ee8e5979277f7fc65cc8230685f060253c08e31a5641f8 SHA512 2033f6edcdf98efcb17296845be76d1c2cfc3504fcee965d68536e209f949d26d6ef2326858fe673492e36a5c3aebd14eb3e0ef96355ca43d25a23f19b612d01
 DIST barcode-0.99.tar.xz 586028 BLAKE2B a6ef5a4f0061bd0f0cb65a791516383259f317801e9f5ea02c626735cd3ed5f00e0a92502b9b5e3dcb8ea95c313e10f5abf9c172e1094111dea7f3cfb45ec032 SHA512 1f3015ee9cb2e57e38e56fa48fa3a38fa355821801bad3132d3e87b5b88db4f167986c33dc044317cbf18bb62062af36e946daab98235ff7015a00937c8dd41e
 EBUILD barcode-0.99-r1.ebuild 753 BLAKE2B c25d230a2d70cafdaf9394f20d7901ac41a5249a0a41edd202c1079258ab06e703823fbc61112414d3f0fa5fef8b44dadfa88dd8e4d23f0c2529f3872f28c972 SHA512 3e3486d9d952dc92818a2cbb6ea420c5da299716dd97d3c134e2dacfd8f591bb84760996853e21ed41a4893196ebf44d39cd86b6bbc79df6f04236d16dc6d0c0
-MISC metadata.xml 244 BLAKE2B f06f28c2ffab348c5d491944712eb7016f0f4d8ff911d3271723814c8d9f3ca45ed9150699f2895c65cd1a7ca25f2e4aa872e7a562ef58fa1f172fb41194fa1d SHA512 0852b52ec19f2637ef378f7ea2b143d80f1f1cf46d1e099f6b1de24eaa79b6ee3abb32f75c07dcf279a30b0c6028677481af36314b09f7d31587b9b2af072899
+MISC metadata.xml 332 BLAKE2B cbd827ae4db4f4230f7ce483ada7e58d976fd4fa5a508e35725ce97dac038416fdb73969f0bdbfe313ae85ddcc8fc9e43bbd5959af3105de8b162abce1267fd3 SHA512 2268bd4b0e057e8a1bddb53e1bb1d82f69d28f62cd02f297b55fe1403c1ded3294912009464ef3b21a3831ccede5c496f24a2c60a11fbfb4586d20fe527fa34a
diff --git a/app-text/barcode/metadata.xml b/app-text/barcode/metadata.xml
index 3dcb3e34c200..b4e14c04b700 100644
--- a/app-text/barcode/metadata.xml
+++ b/app-text/barcode/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>tamiko@gentoo.org</email>
-	<name>Matthias Maier</name>
-</maintainer>
+  <maintainer type="person">
+    <email>tamiko@gentoo.org</email>
+    <name>Matthias Maier</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">barcode</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/enscript/Manifest b/app-text/enscript/Manifest
index 8d377836c452..f4c6c9cd4be4 100644
--- a/app-text/enscript/Manifest
+++ b/app-text/enscript/Manifest
@@ -7,4 +7,4 @@ AUX enscript-1.6.5.2-php.st.patch 210 BLAKE2B 85f6531797d84e8b6ad3933785e5a019c9
 AUX ruby.st 3904 BLAKE2B 854c86166a43715e85e91802f2d82eae71773d9caabf604bd5edc0e53046ed0fa9944ec61c5ff7516e22740cc90ac73dc1d8edbdc0e9722ec876be3a129d2183 SHA512 43af0998ebe95530129aec126b9f91878bbbf7dd52530cb162b25f5779f9eb5b870f41727665e66dd5cf42a6d5e790899bf03c38c1a914adf2b0eecac83154e2
 DIST enscript-1.6.6.tar.gz 1330493 BLAKE2B 02e333271ac6716e049402d5904b0ad6926b31d4533c813a9e5bcf76045d4100def2476426b97c52585e8f5c0a741159fb3e78de79c817e75de81ebd464c0d61 SHA512 bf1c2b9ea7723518a1ef312145ddcd6ffdef0c6e8b5795ea84cb55d76fccc02f441d0c2dc6897e970368186e6a829ab74a090716624e0f7a8f575653fa495ebc
 EBUILD enscript-1.6.6-r1.ebuild 1304 BLAKE2B fb16c54147f6ae46e27b135c57803e611c477d9e58113811cc1f78c5396624a1944a6aa57fa0e001f9f9d5e0333a2db23d700267a76d7629f96d84e4c4465e13 SHA512 9954ba339e91ab6c2208305686f315fcd32c509ceda451e0a3db7847d4ac1202337d4202a278da8b90facab87d541a7f494509458e2750d6f2e5a503f9a465b1
-MISC metadata.xml 256 BLAKE2B 16ea76357721c3ab7d672ade29d27338ddf9da983571e4ca4efe2520c741fc71315d9609b711850b00c19ed4eea848dea0d5b3955eecb401c42c4db257c300bf SHA512 2748afab7ffea0b3ddadf72dc720f7d83a1d76453fa569091abffe834ec187144a47f9365ccb4a97f676dbcfd799a6be92671f283b179fe4589d95486d7fd24d
+MISC metadata.xml 345 BLAKE2B 5f506e3c1e1ec31bafe091fbf17b256482ec6ec8bdce90d9981355341695fb7feac37e9db828d0b1dccd9a9e23f4d015e15597ffd72c346652dc6bdd92284889 SHA512 a06aa8b58967bd1a4f7bd65935f6ba3a569c7d3dfcb28458b41885267e92d060873024c8663a72fb94109c0081a18ee516b660943c24a0838d6270d9be3c367f
diff --git a/app-text/enscript/metadata.xml b/app-text/enscript/metadata.xml
index e2fedda90ee1..167f8f30a26a 100644
--- a/app-text/enscript/metadata.xml
+++ b/app-text/enscript/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>printing@gentoo.org</email>
-	<name>Gentoo Printing Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">enscript</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/ocrad/Manifest b/app-text/ocrad/Manifest
index 19d6babdf34f..39d6e17bb67f 100644
--- a/app-text/ocrad/Manifest
+++ b/app-text/ocrad/Manifest
@@ -1,3 +1,3 @@
 DIST ocrad-0.27.tar.lz 91709 BLAKE2B 4dd152e6ccbd41d2ce7e7e3d4fc38e30af4f0bb9c36e32b1f32e67772347af133cf67a8b89c03d5c9924a1d4ffa009205b80609cdb96a59b3dbeb76709a8e8e1 SHA512 2a4731e0e26eefe6d37b08859c4d3cc2b54180411b0f846f7b7e873b9da5b4596ca3c6042ee42284a07aadfeb96d953dce3e95ce2410e48624d1b6020750539c
 EBUILD ocrad-0.27.ebuild 788 BLAKE2B f637f6731cf32336a5e775e55f5ff3a47cae1edd25d30032d2553a2976877e16bab4c11bc099b7a792bac38dd9585f788652125fbcc19b0d2f8b0d3a7b77d07f SHA512 db4aef8384dc9d4a103aa46b721b898dde07b1197a286527a28893b0c3d1169361b40dc0775a29d8fb86cbe969c822e26c1f9a9b6051cce2203c83e13c68b080
-MISC metadata.xml 419 BLAKE2B 4fc7676b5c98871fcf256365d75d6e778ff10dc528a9a4c890bdda6b7c279ade210f6548f032ea8970e52a493d7c85ed606263ffcd91457e5b9b8b754de43862 SHA512 1462ecbd11fe23ed10f4db07b5bd0672c711159f0c9b72b8502336b1337a43a2e91c0efd2a81e4c5f127596f4a959c0901d1de6b0dde96a8bf1126c105b41ebb
+MISC metadata.xml 505 BLAKE2B a4fb6e973e05860f913c1c2c345ec6905e268a00f873b7d05d75d06b796f4f0c53334bfd9f6cce0d628345c7ac839db2e0c0878a67cba94eea2b25743b5b12a3 SHA512 ed7b97ffd080347154ab918c7bda56344660021586803782ff236c95ab7874e0a8b4c08515439465f46acbba703ac0e51c521721889b8855296d4534386a49f6
diff --git a/app-text/ocrad/metadata.xml b/app-text/ocrad/metadata.xml
index 7dd28abde319..1e689d2596fc 100644
--- a/app-text/ocrad/metadata.xml
+++ b/app-text/ocrad/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-<longdescription>GNU Ocrad is an OCR (Optical Character Recognition)
+  <!-- maintainer-needed -->
+  <longdescription>GNU Ocrad is an OCR (Optical Character Recognition)
 program impleme nted as a filter and based on a feature extraction
 method. It reads a bitmap ima ge in pbm format and outputs text in
 ISO-8859-1 (Latin-1) charset.</longdescription>
+  <upstream>
+    <remote-id type="savannah-nongnu">ocrad</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/teseq/Manifest b/app-text/teseq/Manifest
index 9578a69772b5..e62b8dbf2fe1 100644
--- a/app-text/teseq/Manifest
+++ b/app-text/teseq/Manifest
@@ -1,3 +1,3 @@
 DIST teseq-1.1.1.tar.xz 240256 BLAKE2B 657579ba89c2e7cd4cd2e54234d3ae79d9f8d999475a33ba78945da223457a065a631baa397ab06a137cfdfac360d83992a5f39d5bd3b97fd8cd96cf29c68ac2 SHA512 c7747c734e640f7cc607389e001ab2cb9e368b504bd41406eea4dd7ba8bfead79659c68b148e33e797b843e9a46de38d104172303329b88e3fde0266aa1ffd7c
 EBUILD teseq-1.1.1.ebuild 332 BLAKE2B 735e94cce3d1cc3f7796ff0fa2048cb95b8226f9cbfcbf206f53704655def1878d707d89cf57e494b72bdd8861dab16263e5295f37d8703ff892d130726d3e15 SHA512 c80124baaf706f11c002e6b35051a973ecea6334c0fad72efe71df98f455d92f7a7ca4fedcfc6a5230e51804baef16911491ba1042b6682c7b87d8463251ebe1
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 245 BLAKE2B 7eaa8f1961243c34a9026209e970c173a53efe21fa7033783c42928f8f1d8140facc1c3d121ad26b80fac750016982c55c6a07ae4205a2b0d49eabcab0b861b9 SHA512 9ee5fecefc3387c998dfc60302cd7c9669a7b728fc4bc5e0607d9024caf8c3b63ae51122bea7c0a165e20bce2b9a35e719d364a21e47874309b256a8f49e03f0
diff --git a/app-text/teseq/metadata.xml b/app-text/teseq/metadata.xml
index 85e4ed814fa2..f2d895595ee5 100644
--- a/app-text/teseq/metadata.xml
+++ b/app-text/teseq/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="savannah">teseq</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/texi2html/Manifest b/app-text/texi2html/Manifest
index 15c8d8a0f804..3cb2a9d0f0ec 100644
--- a/app-text/texi2html/Manifest
+++ b/app-text/texi2html/Manifest
@@ -1,3 +1,3 @@
 DIST texi2html-5.0.tar.bz2 15397249 BLAKE2B 3e502d9424c2936a922488aab7a66140c0a8369253a5500beeebcea0942ffa7b97fb7021b23212264e110d4bdab4850f263269aacf61de23ac6e052dfcf10d67 SHA512 50afc2f1f8875d3e62a51cc0339bd4c4f058041f42a9fda9cd5b02960f0d5c72838e4f010702ba716dbd256946f64520ce1e5b86539b6f7b8b7ce24a43c98e9d
 EBUILD texi2html-5.0-r1.ebuild 1347 BLAKE2B 8e5a3d44afde04084bd5d9e695fa8d13d88014502472ba9a5032237778e29115ca7ce4cdaaeeba12490eb274cc6ffb5f9c158a8f2e03195ca3dcc9c588a39872 SHA512 5bd3546c48541b767510500425d52f34055fb2bf60e4b4462d448ad3e114c17b7025dd06bab7e958faff0c28add6988f568924f28e30620f556fa32c34f5ad4b
-MISC metadata.xml 246 BLAKE2B b56c934f8eecd3492d6abe15cf5883fdbc1979c37abbc5ad196e345ee17bb865db5eab10ac7de93bbfce94c4e865bf6b86d5f8bc081b5cb1d3d58d1158b81921 SHA512 b61f56c5e078714565ff9e33c81217e788f78bae9cf10d6ca78a82703a8e08119dff3afa68306eced0b7c62db9220d28efa4c9782e943c991e30b25b9ead82f5
+MISC metadata.xml 343 BLAKE2B 7a7bf9e9fd177ec4d24882c9d9ca602f6a70f1f5d318ca4799adb6bfb5e80664d87a25f63552bc9eef842d48df8553670a4b5c9e0042b4983b9081bc9229650f SHA512 9e7cda1b8c50d834288e03f540fb72aa8cc4e99c930e158a6dc2543c0d7c9bb52d04c084bba0a9ce4dc240ce022a959c4e14f21c13f62a58944b32196fa5be56
diff --git a/app-text/texi2html/metadata.xml b/app-text/texi2html/metadata.xml
index edfe97231997..5e7a2226a9ce 100644
--- a/app-text/texi2html/metadata.xml
+++ b/app-text/texi2html/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>tex@gentoo.org</email>
-	<name>Gentoo TeX Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>tex@gentoo.org</email>
+    <name>Gentoo TeX Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah-nongnu">texi2html</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/unrtf/Manifest b/app-text/unrtf/Manifest
index e396f32f9a4a..a8ed0fd1b72a 100644
--- a/app-text/unrtf/Manifest
+++ b/app-text/unrtf/Manifest
@@ -1,3 +1,3 @@
 DIST unrtf-0.21.10.tar.gz 812696 BLAKE2B 3edc654feee461bb785877c3c3829462b9f55556e352bd12a19e426911336e161431badf5fdf5e00b0c488ca1804a0922ac7eb6980ebec58232112f6cf156f34 SHA512 31bedd1a23a052c1235e1328a12b346a0fe48b3f3cf78d72c068fe0d3edf18bc78f4c9dfe2f093ee8b4f3c79e923c6ceda49bc257d191dd5371f9273809343c9
 EBUILD unrtf-0.21.10.ebuild 418 BLAKE2B 8b64e532e9e5245a02437b4946fe49a9fc45061b1b4d669120061563253a266790e730d73d77503a85d68c9d018a6249152d1697c8d633d247ae59a16ac3d9d9 SHA512 fff47f1c8be4ad7e2f6956d158703b29c7d48db3339d95eb50151ec2a7c21aa99db19152779de6b4b470aaa690b8ebf1805fd22d567f315dbbc85f3d90363f72
-MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
+MISC metadata.xml 299 BLAKE2B 492d0e3ba9bff1a327d49c13d54bce9fadbd690ce4ebd5f62b283545b098f553d93cb1938c0c66da695f06775e6a035e87d70c01dd04985cd9e850d360ec377c SHA512 b4d3519e2e55716235643397e55b101a80808ed1cb82f2618f0779551d0d6e5ed8abffd65e2203c64d604f23d23575c0f93bd2c897cb3e29ff0ed73c32d30ca9
diff --git a/app-text/unrtf/metadata.xml b/app-text/unrtf/metadata.xml
index aaab041e8885..a85206b18af2 100644
--- a/app-text/unrtf/metadata.xml
+++ b/app-text/unrtf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>robbat2@gentoo.org</email>
-</maintainer>
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">unrtf</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/wdiff/Manifest b/app-text/wdiff/Manifest
index c80186287d49..8c7aa723ee8b 100644
--- a/app-text/wdiff/Manifest
+++ b/app-text/wdiff/Manifest
@@ -1,3 +1,3 @@
 DIST wdiff-1.2.2.tar.gz 1478567 BLAKE2B 80de7ecdd8fef1a4c9e6e0830e1af52d5087abc235dbe2bcf7542c0f017c1a21036243162fa6f70e714f3544d74e9a1add70dc22e69f306a17ce9bdd49c5bc15 SHA512 9272c225f4f61612197fe151cf8c913107169ac9fcd6c9f8472a0f56d9124d78a060944cea1b51489ca34311220f23638d043d43c733a3252cdbb7cceb1085ed
 EBUILD wdiff-1.2.2-r2.ebuild 877 BLAKE2B 4b52042a689f1cff350530def560e77363c5be4f24299bf337643069266dc9c6d6b693077708e9b3d9581827d69c0b4c25935901665ecf78a494e122662988cc SHA512 d1a7c44fe9514907f5487d82f6db161e7a7e16fe94c03195aa6286443c399ba6a88e88bc42a658bd3191f056091f9dc124dd7e4ed6b2b664df42232a52f333f5
-MISC metadata.xml 378 BLAKE2B 95e3d451a7fd7af4da58c03b88615a0547c6063c0e4601dde7781db46f0805b06a76d900a0407ace672cf76c2b6c481f775c2b1d7da5653418e26ad71ae7ec32 SHA512 1da43e6a6e6907de98682dcb9221b33327d2fec70675452e40262eada16d7c94f312a1dbe40a770b064d4034848d84801f3a9c5f887a669664722198cadfea6b
+MISC metadata.xml 454 BLAKE2B 6d49b2f1567da8dc620744510204eff45d0af3bca362d79282c90e6a14d0a208ea7195a7ecbc21d694934daf6f3b873f0e9eceb09740a3243fe482bb68ceea93 SHA512 93304e13f51fd285ab2eb2d82ef888290a5327e3d9cf7a12a2f792a36ffe170709f13e17188c856c47ff4fd2a8506c4ce5ffb3cacfe4bc237b8a017b8347540f
diff --git a/app-text/wdiff/metadata.xml b/app-text/wdiff/metadata.xml
index cd21cfd82da6..988be0d02805 100644
--- a/app-text/wdiff/metadata.xml
+++ b/app-text/wdiff/metadata.xml
@@ -8,4 +8,7 @@
   <use>
     <flag name="experimental">Build experimental utilities (mdiff, unify, wdiff2)</flag>
   </use>
+  <upstream>
+    <remote-id type="savannah">wdiff</remote-id>
+  </upstream>
 </pkgmetadata>