diff --git a/advisors/helper/version_exceptions.yaml b/advisors/helper/version_exceptions.yaml
index f45a719899d70f312be44eda4230303bb2b94cba..3a2aaa20e887e26db84d93513b0efe5138788335 100644
--- a/advisors/helper/version_exceptions.yaml
+++ b/advisors/helper/version_exceptions.yaml
@@ -38,3 +38,8 @@ reflections:
     - '21959e6e'
 initial-setup:
     - '1091470'
+pnm2ppa:
+    - '19991*'
+castor:
+    - '2002'
+    - '20000*'
diff --git a/upstream-info/apache-poi.yaml b/upstream-info/apache-poi.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5078bc3a05cb19c86a0dbcc6539ad23b34c87aea
--- /dev/null
+++ b/upstream-info/apache-poi.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: apache/poi
+tag_pattern: "REL_(.*)(_FINAL)?"
+separator: "_"
diff --git a/upstream-info/castor.yaml b/upstream-info/castor.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..0e422168313d25ed6b9122541d63659a40073e68
--- /dev/null
+++ b/upstream-info/castor.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: castor-data-binding/castor
+tag_prefix: "^castor-"
+separator: "."
diff --git a/upstream-info/eclipselink.yaml b/upstream-info/eclipselink.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..095ddee25eeb3229947cba3ddeca3a41688004ee
--- /dev/null
+++ b/upstream-info/eclipselink.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: eclipse-ee4j/eclipselink
+tag_prefix:
+separator: "."
diff --git a/upstream-info/fmpp.yaml b/upstream-info/fmpp.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2b684f35414027489ec21c42c6abd5f7c9e18ea7
--- /dev/null
+++ b/upstream-info/fmpp.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: freemarker/fmpp
+tag_prefix: "^v"
+separator: "."
diff --git a/upstream-info/grizzly.yaml b/upstream-info/grizzly.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..4b085d8f63ec5b275483bf2532f2018d60e57b66
--- /dev/null
+++ b/upstream-info/grizzly.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: javaee/grizzly
+tag_prefix:
+separator: "_"
diff --git a/upstream-info/hibernate-validator.yaml b/upstream-info/hibernate-validator.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..01c654670eeccc679f4075f489e9f6fbb461ce74
--- /dev/null
+++ b/upstream-info/hibernate-validator.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: hibernate/hibernate-validator
+tag_pattern: "(.*).Final"
+separator: "."
diff --git a/upstream-info/perl-Test-MockModule.yaml b/upstream-info/perl-Test-MockModule.yaml
index 3b5b0d09f28163cb8ab042f7f0229f560de7fa69..c6e446c552263776d4d658f53c28b37d768f1d9a 100644
--- a/upstream-info/perl-Test-MockModule.yaml
+++ b/upstream-info/perl-Test-MockModule.yaml
@@ -1,5 +1,5 @@
 ---
 version_control: metacpan
 src_repo: Test-MockModule
-tag_prefix: "^"
+tag_prefix: "^v"
 separator: "."
diff --git a/upstream-info/perl-Unicode-Collate.yaml b/upstream-info/perl-Unicode-Collate.yaml
index ed3bc3a1b8a5a059936f7de828ed6d90f449c075..c2af54cdcd728bd1ecbf3bd84327e1909b7dc1e7 100644
--- a/upstream-info/perl-Unicode-Collate.yaml
+++ b/upstream-info/perl-Unicode-Collate.yaml
@@ -1,6 +1,5 @@
 ---
-version_control: git
-src_repo: https://src.fedoraproject.org/rpms/perl-Unicode-Collate.git
-tag_prefix: "^perl-Unicode-Collate-"
+version_control: metacpan
+src_repo: Unicode-Collate
+tag_prefix:
 separator: "."
-git_url: https://src.fedoraproject.org/rpms/perl-Unicode-Collate.git
diff --git a/upstream-info/php.yaml b/upstream-info/php.yaml
index 0a339ad1fcde86045b241eebaecf34111d49ec7b..93954079b4745583aa1ab7a85913f36cdbe049e2 100644
--- a/upstream-info/php.yaml
+++ b/upstream-info/php.yaml
@@ -1,7 +1,5 @@
 ---
 version_control: github
 src_repo: php/php-src
-tag_prefix: php-
+tag_prefix: "^php-"
 separator: "."
-git_url: https://github.com/php/php-src.git
-git_tag:
diff --git a/upstream-info/plexus-component-factories-pom.yaml b/upstream-info/plexus-component-factories-pom.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f5a01f83fd7c6a250a2074e78be15796e69bf550
--- /dev/null
+++ b/upstream-info/plexus-component-factories-pom.yaml
@@ -0,0 +1,9 @@
+---
+version_control: github
+src_repo: sonatype/plexus-component-factories
+tag_pattern: "plexus-component-factories-(.*)-alpha-(.*)"
+separator: "."
+git_tag:
+    plexus-component-factories-1.0-alpha-9
+    plexus-component-factories-1.0-alpha-10
+    plexus-component-factories-1.0-alpha-11
diff --git a/upstream-info/pnm2ppa.yaml b/upstream-info/pnm2ppa.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ba5143f6ea770de1edd7ef8581d0c15724266787
--- /dev/null
+++ b/upstream-info/pnm2ppa.yaml
@@ -0,0 +1,5 @@
+---
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/pnm2ppa/files/pnm2ppa
+tag_prefix:
+separator: "."
diff --git a/upstream-info/polkit-gnome.yaml b/upstream-info/polkit-gnome.yaml
index ec8f6642b299bbb4c72a2bbee51af177db02200b..cc6f18e679e514fd34321c98a0c076c950a573f4 100644
--- a/upstream-info/polkit-gnome.yaml
+++ b/upstream-info/polkit-gnome.yaml
@@ -1,4 +1,4 @@
-version_control: git
-src_repo: https://gitlab.gnome.org/Archive/policykit-gnome
-tag_prefix: NA
-separator: .
+version_control: gitlab.gnome
+src_repo: Archive/policykit-gnome
+tag_prefix:
+separator: "."
diff --git a/upstream-info/popt.yaml b/upstream-info/popt.yaml
index 2af4e512b553ee447e995ebf96fb1847c40957e9..6b7d5bc6244a5e29bb9b9a430a71c7c70610aadf 100644
--- a/upstream-info/popt.yaml
+++ b/upstream-info/popt.yaml
@@ -1,6 +1,5 @@
 ---
 version_control: github
 src_repo: rpm-software-management/popt
-tag_prefix: "^popt-"
-separator: "."
-git_url: https://github.com/rpm-software-management/popt.git
+tag_pattern: "popt-(.*)-release"
+separator: "_"
diff --git a/upstream-info/py3c.yaml b/upstream-info/py3c.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..89e7aa4c3ef03b043b9f55a35f365076568c5580
--- /dev/null
+++ b/upstream-info/py3c.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: encukou/py3c
+tag_prefix: "^v"
+separator: "."
diff --git a/upstream-info/pygobject2.yaml b/upstream-info/pygobject2.yaml
index 33170258f894ba0818bf3e7810dc450f73869bb4..d2d183ee6c02d69476b6ea76739e5d595d3d0395 100644
--- a/upstream-info/pygobject2.yaml
+++ b/upstream-info/pygobject2.yaml
@@ -1,12 +1,5 @@
 ---
 version_control: gitlab.gnome
 src_repo: pygobject
-tag_prefix: "^"
-separator: "."
-git_url: https://gitlab.gnome.org/GNOME/pygobject.git
-git_tag:
-- 2020-03-08 3.36.0
-- 2019-09-09 3.34.0
-- 2019-08-18 3.33.1
-- 2019-03-07 3.31.4
-- 2019-02-02 3.31.3
+tag_prefix: "^3|PYGOBJECT_"
+separator: "_"
diff --git a/upstream-info/python-marshmallow.yaml b/upstream-info/python-marshmallow.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..4136c0189979fb9226418c9bd88a488edb98eb28
--- /dev/null
+++ b/upstream-info/python-marshmallow.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: marshmallow-code/marshmallow
+tag_prefix:
+separator: "."
diff --git a/upstream-info/python-ordered-set.yaml b/upstream-info/python-ordered-set.yaml
index e67b8860b4adf80275002368672e26519cf1c5e0..c4a70f46182ecc7f94c962d1eee7dc9f753cc6ca 100644
--- a/upstream-info/python-ordered-set.yaml
+++ b/upstream-info/python-ordered-set.yaml
@@ -1,5 +1,5 @@
 ---
-version_control: github
-src_repo: LuminosoInsight/ordered-set
-tag_prefix: "^release/"
+version_control: pypi
+src_repo: ordered-set
+tag_prefix:
 separator: "."
diff --git a/upstream-info/python-pyudev.yaml b/upstream-info/python-pyudev.yaml
index 1776395da1bd28600c15f942c21df98679115cbd..4604fccfc0ab70d3185f2e6308ea14a58e675f34 100644
--- a/upstream-info/python-pyudev.yaml
+++ b/upstream-info/python-pyudev.yaml
@@ -1,5 +1,5 @@
 ---
-version_control: github
-src_repo: pyudev/pyudev
-tag_prefix: "^v"
+version_control: pypi
+src_repo: pyudev
+tag_prefix:
 separator: "."
diff --git a/upstream-info/python-simplejson.yaml b/upstream-info/python-simplejson.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ef140deaea5ac763e37597f1a2e21524e5bcea7c
--- /dev/null
+++ b/upstream-info/python-simplejson.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: simplejson/simplejson
+tag_prefix: "^v"
+separator: "."
diff --git a/upstream-info/python2.yaml b/upstream-info/python2.yaml
index 50c0ac1d35d7b2dffb6f0fb940067dd7dfa37037..c8eb89433bc6f0f663d6963dc12101ffc6115c41 100644
--- a/upstream-info/python2.yaml
+++ b/upstream-info/python2.yaml
@@ -1,6 +1,5 @@
 ---
 version_control: github
 src_repo: python/cpython
-tag_prefix: "^v?3*|^v"
+tag_prefix: "^v?3|v1|v0|v"
 separator: "."
-url: https://github.com/python/cpython.git
diff --git a/upstream-info/python3.yaml b/upstream-info/python3.yaml
index d723c42fd335ea2ae75e11836a8f9cf324f3b7f6..a9f225a939b29b0d84b574d1890fb8df9f73468f 100644
--- a/upstream-info/python3.yaml
+++ b/upstream-info/python3.yaml
@@ -1,7 +1,5 @@
 ---
 version_control: github
 src_repo: python/cpython
-tag_prefix: "^v"
+tag_prefix: "^v?2|v1|v0|v"
 separator: "."
-url: https://github.com/python/cpython.git
-git_tag:
diff --git a/upstream-info/pyxattr.yaml b/upstream-info/pyxattr.yaml
index 007d4e942ef002b048a73242238f2f49b6c671e3..d0147d3e4ab6377ce444c9552ae43858edd87ddc 100644
--- a/upstream-info/pyxattr.yaml
+++ b/upstream-info/pyxattr.yaml
@@ -1,15 +1,5 @@
 ---
 version_control: github
 src_repo: iustin/pyxattr
-tag_prefix: "^v"
-separator: 
-git_url: https://github.com/iustin/pyxattr.git
-git_tag:
-- 2019-11-26 v0.7.1
-- 2019-11-26 v0.7.0
-- 2018-07-25 pyxattr-v0.6.1
-- 2017-01-23 pyxattr-v0.6.0
-- 2016-04-09 pyxattr-v0.5.6
-- 2015-05-01 pyxattr-v0.5.5
-- 2015-04-30 pyxattr-v0.5.4
-- 2014-05-23 pyxattr-v0.5.3
+tag_prefix: "^(pyxattr-)?v"
+separator: "." 
diff --git a/upstream-info/quota.yaml b/upstream-info/quota.yaml
index 28afa3ec5c38acbd331cf4a4ce446e8302d836ba..b57efdb692e37f8f9739deb851f429cd14843b39 100644
--- a/upstream-info/quota.yaml
+++ b/upstream-info/quota.yaml
@@ -1,7 +1,5 @@
 ---
 version_control: git
 src_repo: https://git.code.sf.net/p/linuxquota/code
-tag_prefix: quota-
+tag_prefix: "^v"
 separator: "."
-git_url: https://git.code.sf.net/p/linuxquota/code
-git_tag:
diff --git a/upstream-info/rabbitmq-java-client.yaml b/upstream-info/rabbitmq-java-client.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f17634f54ae3afc01995bf4f213012559d5d3337
--- /dev/null
+++ b/upstream-info/rabbitmq-java-client.yaml
@@ -0,0 +1,6 @@
+---
+version_control: github
+src_repo: rabbitmq/rabbitmq-java-client
+tag_prefix: "^(rabbitmq_)?v"
+separator: "_"
+
diff --git a/upstream-info/raspberrypi-firmware.yaml b/upstream-info/raspberrypi-firmware.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..b298b34ec0c1670e3a01a7cd9e07ecaf08c7fab3
--- /dev/null
+++ b/upstream-info/raspberrypi-firmware.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: raspberrypi/firmware
+tag_prefix: "^1."
+separator: "."
diff --git a/upstream-info/rhnlib.yaml b/upstream-info/rhnlib.yaml
index 42e57723fa8a571c41fd2a87411e72b990daf07b..ea8361f61cba340653a1718d75b64f126fae67c8 100644
--- a/upstream-info/rhnlib.yaml
+++ b/upstream-info/rhnlib.yaml
@@ -1,55 +1,5 @@
 ---
 version_control: github
 src_repo: spacewalkproject/spacewalk
-tag_prefix: "^v"
+tag_prefix: "^rhnlib-"
 separator: "."
-git_url: https://github.com/spacewalkproject/spacewalk.git
-git_tag:
-- 2020-06-02 spacewalk-setup-2.11.3-1
-- 2020-06-02 spacewalk-backend-2.11.4-1
-- 2020-06-01 perl-DBD-Oracle-1.62-10
-- 2020-06-01 cx_Oracle-7.3-1
-- 2020-06-01 perl-DBD-Oracle-1.62-9
-- 2020-06-01 oracle-lib-compat-18.5.0.1-1
-- 2020-06-01 oracle-xe-selinux-10.2.0.49-1
-- 2020-06-01 cx_Oracle-5.3-6
-- 2020-06-01 perl-DBD-Oracle-1.62-8
-- 2020-06-01 spacewalk-2.11.1-1
-- 2020-06-01 spacewalk-java-2.11.4-1
-- 2020-06-01 spacewalk-search-2.11.1-1
-- 2020-06-01 spacewalk-setup-2.11.2-1
-- 2020-06-01 spacewalk-selinux-2.11.2-1
-- 2020-05-25 spacecmd-2.11.4-1
-- 2020-05-25 spacecmd-2.11.3-1
-- 2020-05-25 perl-Mail-RFC822-Address-0.3-17
-- 2020-05-25 momentjs-2.6.0-7
-- 2020-05-25 spacecmd-2.11.2-1
-- 2020-05-25 tanukiwrapper-3.2.3-23
-- 2020-05-25 perl-Mail-RFC822-Address-0.3-16
-- 2020-05-11 spacewalk-backend-2.11.3-1
-- 2020-05-11 spacewalk-utils-2.11.7-1
-- 2020-05-11 patternfly1-1.0.5-11
-- 2020-04-07 spacewalk-utils-2.11.6-1
-- 2020-04-02 spacewalk-remote-utils-2.11.1-1
-- 2020-03-25 spacewalk-setup-postgresql-2.11.2-1
-- 2020-03-23 perl-Satcon-2.11.1-1
-- 2020-03-20 spacewalk-utils-2.11.5-1
-- 2020-03-20 spacewalk-utils-2.11.4-1
-- 2020-03-17 redstone-xmlrpc-1.1_20071120-23
-- 2020-03-17 quartz-1.8.4-12
-- 2020-03-17 redstone-xmlrpc-1.1_20071120-22
-- 2020-03-17 spacewalk-setup-postgresql-2.11.1-1
-- 2020-03-17 spacewalk-java-2.11.3-1
-- 2020-03-17 spacewalk-backend-2.11.2-1
-- 2020-03-17 python-hwdata-2.3.7-1.5
-- 2020-03-17 dwr-3.0.2-3
-- 2020-03-17 jpam-0.4-40
-- 2020-03-17 stringtree-json-2.0.9-14
-- 2020-03-17 simple-core-3.1.3-11
-- 2020-03-17 spacewalk-proxy-2.11.2-1
-- 2020-03-17 spacewalk-utils-2.11.3-1
-- 2020-03-13 spacewalk-selinux-2.11.1-1
-- 2020-03-13 spacewalk-proxy-2.11.1-1
-- 2020-03-13 rhnpush-5.5.123-1
-- 2020-03-12 rhnpush-5.5.122-1
-- 2020-03-12 spacewalk-java-2.11.2-1
diff --git a/upstream-info/rpm.yaml b/upstream-info/rpm.yaml
index 7950ad34d81e0c86a10986548d27328f23af3d59..3528e96d9386ddff4f97907b9e7a7ee8cf2c8963 100644
--- a/upstream-info/rpm.yaml
+++ b/upstream-info/rpm.yaml
@@ -1,7 +1,5 @@
 ---
 version_control: github
 src_repo: rpm-software-management/rpm
-tag_prefix: "^rpm-"
-separator: _
-git_url: https://github.com/rpm-software-management/rpm.git
-git_tag:
+tag_pattern: "rpm-(.*)-release"
+separator: "."
diff --git a/upstream-info/shared-mime-info.yaml b/upstream-info/shared-mime-info.yaml
index 213b06da8c0daacdf51c20b46f6e612ce9950c3b..a907cd6646154c0f36b8d6554394351536228a72 100644
--- a/upstream-info/shared-mime-info.yaml
+++ b/upstream-info/shared-mime-info.yaml
@@ -2,5 +2,4 @@
 version_control: git
 src_repo: https://gitlab.freedesktop.org/xdg/shared-mime-info.git
 tag_prefix: "^Release-"
-separator: "."
-git_url: https://gitlab.freedesktop.org/xdg/shared-mime-info.git
+separator: "-"
diff --git a/upstream-info/sil-nuosu-fonts.yaml b/upstream-info/sil-nuosu-fonts.yaml
index 8bd61fe6702eeb01fb9e9880ad01da3ceccb3af8..c4ee8121ed13da0c17a59a51c6b61a8f9f0fefe3 100644
--- a/upstream-info/sil-nuosu-fonts.yaml
+++ b/upstream-info/sil-nuosu-fonts.yaml
@@ -1,7 +1,5 @@
 ---
 version_control: github
 src_repo: silnrsi/font-nuosu
-tag_prefix: "^"
+tag_prefix: "^v"
 separator: "."
-git_url: https://github.com/silnrsi/font-nuosu.git
-git_tag:
diff --git a/upstream-info/sil-scheherazade-fonts.yaml b/upstream-info/sil-scheherazade-fonts.yaml
index 1d03c4da5135472a10780a985162158263cd9e48..1cb7a137f32208f54dd4e805f008619cb4d02483 100644
--- a/upstream-info/sil-scheherazade-fonts.yaml
+++ b/upstream-info/sil-scheherazade-fonts.yaml
@@ -1,7 +1,5 @@
 ---
 version_control: github
 src_repo: silnrsi/font-scheherazade
-tag_prefix: "^"
+tag_prefix: "^v"
 separator: "."
-git_url: https://github.com/silnrsi/font-scheherazade.git
-git_tag:
diff --git a/upstream-info/sonatype-oss-parent.yaml b/upstream-info/sonatype-oss-parent.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6bb12afffbfe885f41957a91f7a146bf3582ef0d
--- /dev/null
+++ b/upstream-info/sonatype-oss-parent.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: sonatype/oss-parents
+tag_prefix: "^oss-parent-"
+separator: "."
diff --git a/upstream-info/sox.yaml b/upstream-info/sox.yaml
index 190f76e08274a4090c0665a10b0f3365216d8b8e..ccf1f24d6b22f1c0bdc551652ce49daac0594351 100644
--- a/upstream-info/sox.yaml
+++ b/upstream-info/sox.yaml
@@ -1,9 +1,5 @@
 ---
-version_control: github
-src_repo: i386x/sox-downstream
-tag_prefix: "^v"
+version_control: git
+src_repo: https://git.code.sf.net/p/sox/code
+tag_prefix: "^sox-"
 separator: "."
-git_url: https://github.com/i386x/sox-downstream.git
-git_tag:
-- 2018-01-18 v14.4.2.modified
-- 2018-01-18 sox-14.4.2.0.modified
diff --git a/upstream-info/sphinx.yaml b/upstream-info/sphinx.yaml
index 2ee91d071d6d254eeec6a5c5fa3b95ab2a2f82a9..3f34a2d04b95b7d0db7c0781fb809eb28abdbcbf 100644
--- a/upstream-info/sphinx.yaml
+++ b/upstream-info/sphinx.yaml
@@ -1,10 +1,5 @@
 ---
 version_control: github
 src_repo: sphinxsearch/sphinx
-tag_prefix: 
+tag_pattern: "(.*)-release"
 separator: "."
-git_url: https://github.com/sphinxsearch/sphinx.git
-git_tag:
-- 2015-09-07 2.2.10-release
-- 2016-09-08 2.3.2-beta
-- 2016-07-19 2.2.11-release
diff --git a/upstream-info/springframework.yaml b/upstream-info/springframework.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3878a9a9abbb649fe20bac71c49bb62f011ba1ce
--- /dev/null
+++ b/upstream-info/springframework.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: spring-projects/spring-framework
+tag_pattern: "v(.*).RELEASE"
+separator: "."
diff --git a/upstream-info/syscontainer-tools.yaml b/upstream-info/syscontainer-tools.yaml
index 31d40a11930a97597e2c127ae4af4bb0d0a1c323..14d76b805c285d535c0a837c23be78f5681a92fc 100644
--- a/upstream-info/syscontainer-tools.yaml
+++ b/upstream-info/syscontainer-tools.yaml
@@ -1,3 +1,5 @@
 ---
 version_control: gitee
-src_repo: openEuler/syscontainer-tools
+src_repo: openeuler/syscontainer-tools
+tag_prefix: "^v"
+separator: "."
diff --git a/upstream-info/traceroute.yaml b/upstream-info/traceroute.yaml
index 1e06177f87ccc30b1c24f465475a41492f358aad..fa9acc29e2720bfb59ec9492bd3f5ea6859fa842 100644
--- a/upstream-info/traceroute.yaml
+++ b/upstream-info/traceroute.yaml
@@ -1,5 +1,5 @@
 ---
 version_control: sourceforge
 src_repo: https://sourceforge.net/projects/traceroute/files/traceroute/
-tag_prefix: "-"
+tag_prefix: "traceroute-"
 separator: .
diff --git a/upstream-info/ukui-desktop-environment.yaml b/upstream-info/ukui-desktop-environment.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..b5dd1a7eb66b765bfc4044f2cdd8bb279f30fc95
--- /dev/null
+++ b/upstream-info/ukui-desktop-environment.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: ukui/ukui-desktop-environment
+tag_prefix: "^v"
+separator: "."
diff --git a/upstream-info/unicode-emoji.yaml b/upstream-info/unicode-emoji.yaml
index 018c9c58dc0fe43e05ab9656f94c848ecf666d21..fe55599b12fb6f1be644d8baee7c1663d5921b0e 100644
--- a/upstream-info/unicode-emoji.yaml
+++ b/upstream-info/unicode-emoji.yaml
@@ -1,8 +1,5 @@
 ---
-version_control: github
-src_repo: LuaDist/zip
-tag_prefix: "^"
-separator: "."
-git_url: https://github.com/LuaDist/zip.git
-git_tag:
-- 2012-08-20 3.0
+version_control: NA
+src_repo: NA
+tag_prefix:
+separator:
diff --git a/upstream-info/unixODBC.yaml b/upstream-info/unixODBC.yaml
index 2d9e06bfaaa2b3388318f1d6faafa46e32879388..be6b97855f1970bacd1d6f22df921281d0ab684d 100644
--- a/upstream-info/unixODBC.yaml
+++ b/upstream-info/unixODBC.yaml
@@ -1,5 +1,5 @@
 ---
-version_control: svn
-src_repo: https://svn.code.sf.net/p/unixodbc/code
-tag_prefix: ''
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/unixodbc/files/unixODBC
+tag_prefix:
 separator: "."
diff --git a/upstream-info/usb_modeswitch-data.yaml b/upstream-info/usb_modeswitch-data.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..cfbfbac1fedef05279d3a6a577572f91b6f07872
--- /dev/null
+++ b/upstream-info/usb_modeswitch-data.yaml
@@ -0,0 +1,5 @@
+---
+version_control: git
+src_repo: https://salsa.debian.org/debian/usb-modeswitch
+tag_prefix: "^upstream/"
+separator: "."
diff --git a/upstream-info/uuid.yaml b/upstream-info/uuid.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c3ba66a5590359a06a8f604a0c85f62e975763d5
--- /dev/null
+++ b/upstream-info/uuid.yaml
@@ -0,0 +1,5 @@
+---
+version_control: cvs
+src_repo: http://cvs.ossp.org/pkg/lib/uuid
+tag_prefix: "^uuid-"
+separator: "."
diff --git a/upstream-info/valgrind.yaml b/upstream-info/valgrind.yaml
index 652e7a7c761433f495531f903d9fab46d1c8873f..e9ee104bd56d3e3e23d80f65dabcca4eb97ee8cd 100644
--- a/upstream-info/valgrind.yaml
+++ b/upstream-info/valgrind.yaml
@@ -1,6 +1,6 @@
 ---
 version_control: git
 src_repo: https://sourceware.org/git/valgrind.git
-tag_prefix: "^VALGRIND_"
-separator: _
+tag_prefix: "^(svn/)?VALGRIND_"
+separator: "_"
 git_url: https://sourceware.org/git/?p=valgrind.git
diff --git a/upstream-info/vulkan-headers.yaml b/upstream-info/vulkan-headers.yaml
index 792836e32c80cefb5ad2634a37a852824ebab160..2d49ff0c879455839ee41bfb4137a09b6b4ff2af 100644
--- a/upstream-info/vulkan-headers.yaml
+++ b/upstream-info/vulkan-headers.yaml
@@ -1,65 +1,5 @@
 ---
 version_control: github
 src_repo: KhronosGroup/Vulkan-Headers
-tag_prefix: "^v"
+tag_prefix: "^v|sdk-"
 separator: "."
-git_url: https://github.com/KhronosGroup/Vulkan-Headers.git
-git_tag:
-- 2020-07-20 v1.2.148
-- 2020-07-13 v1.2.147
-- 2020-07-04 v1.2.146
-- 2020-06-21 v1.2.145
-- 2020-06-15 v1.2.144
-- 2020-06-08 v1.2.143
-- 2020-06-01 v1.2.142
-- 2020-05-15 v1.2.141
-- 2020-05-04 v1.2.140
-- 2020-04-27 v1.2.139
-- 2020-04-07 v1.2.137
-- 2020-03-24 v1.2.136
-- 2020-03-17 v1.2.135
-- 2020-03-06 v1.2.134
-- 2020-02-15 v1.2.133
-- 2020-01-21 v1.2.132
-- 2020-01-15 v1.2.131
-- 2019-12-09 v1.1.130
-- 2019-11-25 v1.1.129
-- 2019-11-18 v1.1.128
-- 2019-11-03 v1.1.127
-- 2019-10-21 v1.1.126
-- 2019-10-13 v1.1.125
-- 2019-10-06 v1.1.124
-- 2019-09-16 v1.1.123
-- 2019-09-08 v1.1.122
-- 2019-08-25 v1.1.121
-- 2019-08-17 v1.1.120
-- 2019-08-12 v1.1.119
-- 2019-07-28 v1.1.117
-- 2019-07-14 v1.1.115
-- 2019-07-07 v1.1.114
-- 2019-06-29 v1.1.113
-- 2019-06-23 v1.1.112
-- 2019-06-11 v1.1.111
-- 2019-05-13 v1.1.108
-- 2019-01-09 v1.1.97
-- 2018-12-17 v1.1.96
-- 2019-04-26 v1.1.107
-- 2019-04-08 v1.1.106
-- 2019-03-22 v1.1.105
-- 2019-03-11 v1.1.103
-- 2019-03-04 v1.1.102
-- 2019-02-20 v1.1.101
-- 2019-02-14 v1.1.100
-- 2020-05-15 sdk-1.2.141.0
-- 2020-03-17 sdk-1.2.135.0
-- 2019-01-09 sdk-1.1.97.0
-- 2018-11-12 sdk-1.1.92.0
-- 2018-09-20 sdk-1.1.85.0
-- 2018-07-30 sdk-1.1.82.0
-- 2019-12-09 sdk-1.1.130.0
-- 2019-10-28 sdk-1.1.126.0
-- 2019-08-25 sdk-1.1.121.0
-- 2019-07-07 sdk-1.1.114.0
-- 2019-05-13 sdk-1.1.108.0
-- 2019-04-08 sdk-1.1.106.0
-- 2019-02-28 sdk-1.1.101.0
diff --git a/upstream-info/vulkan-loader.yaml b/upstream-info/vulkan-loader.yaml
index c5f449ce542c79d417d18323c5d88a224d8af823..fd83c18800e42bc3b873bb39fbf15f1eb5b08c7a 100644
--- a/upstream-info/vulkan-loader.yaml
+++ b/upstream-info/vulkan-loader.yaml
@@ -1,334 +1,5 @@
 ---
 version_control: github
 src_repo: KhronosGroup/Vulkan-Loader
-tag_prefix: "^v"
+tag_prefix: "^v|sdk-"
 separator: "."
-last_query:
-  time_stamp: 2020-04-27 09:37:16.441372880 +00:00
-  raw_data: |
-    [
-      {
-        "name": "windows-rt-1.0.8.1",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/windows-rt-1.0.8.1",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/windows-rt-1.0.8.1",
-        "commit": {
-          "sha": "28595d60361121434bf3dc46da482cc60538ee6b",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/28595d60361121434bf3dc46da482cc60538ee6b"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOndpbmRvd3MtcnQtMS4wLjguMQ=="
-      },
-      {
-        "name": "windows-rt-1.0.3.0",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/windows-rt-1.0.3.0",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/windows-rt-1.0.3.0",
-        "commit": {
-          "sha": "48202c325ae37b562f8caed041c23aa4c3a43ef0",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/48202c325ae37b562f8caed041c23aa4c3a43ef0"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOndpbmRvd3MtcnQtMS4wLjMuMA=="
-      },
-      {
-        "name": "v1.2.137",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.2.137",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.2.137",
-        "commit": {
-          "sha": "972305cfef2c643970a28cee2af9397845f4a774",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/972305cfef2c643970a28cee2af9397845f4a774"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjIuMTM3"
-      },
-      {
-        "name": "v1.2.135",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.2.135",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.2.135",
-        "commit": {
-          "sha": "521d72b05a58f79caca2faf88aaa8454f9d93e8c",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/521d72b05a58f79caca2faf88aaa8454f9d93e8c"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjIuMTM1"
-      },
-      {
-        "name": "v1.2.134",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.2.134",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.2.134",
-        "commit": {
-          "sha": "29adf277cb191eb1ff5d0156143c284891c0f124",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/29adf277cb191eb1ff5d0156143c284891c0f124"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjIuMTM0"
-      },
-      {
-        "name": "v1.2.133",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.2.133",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.2.133",
-        "commit": {
-          "sha": "0bd30e43c0078152bba0180ee2f2787bc99b1fb2",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/0bd30e43c0078152bba0180ee2f2787bc99b1fb2"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjIuMTMz"
-      },
-      {
-        "name": "v1.2.132",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.2.132",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.2.132",
-        "commit": {
-          "sha": "fb94ccddb725516243644206ab07f0b82e1f0a5e",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/fb94ccddb725516243644206ab07f0b82e1f0a5e"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjIuMTMy"
-      },
-      {
-        "name": "v1.2.131",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.2.131",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.2.131",
-        "commit": {
-          "sha": "20f2d901c085c546e5c732084546e92d3d99cdee",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/20f2d901c085c546e5c732084546e92d3d99cdee"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjIuMTMx"
-      },
-      {
-        "name": "v1.1.130",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.1.130",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.1.130",
-        "commit": {
-          "sha": "1830f45ee904b685a6f8c7137409890df9f349f8",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/1830f45ee904b685a6f8c7137409890df9f349f8"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjEuMTMw"
-      },
-      {
-        "name": "v1.1.129",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.1.129",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.1.129",
-        "commit": {
-          "sha": "4d6938340075ed38bdae3acae4dacb1d3edc76ff",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/4d6938340075ed38bdae3acae4dacb1d3edc76ff"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjEuMTI5"
-      },
-      {
-        "name": "v1.1.128",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.1.128",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.1.128",
-        "commit": {
-          "sha": "c3a2664367d2b49bbffa990101b8b41b97bbe054",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/c3a2664367d2b49bbffa990101b8b41b97bbe054"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjEuMTI4"
-      },
-      {
-        "name": "v1.1.127",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.1.127",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.1.127",
-        "commit": {
-          "sha": "81e965357555eee1a07af512824cfc1e5dd42173",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/81e965357555eee1a07af512824cfc1e5dd42173"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjEuMTI3"
-      },
-      {
-        "name": "v1.1.126",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.1.126",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.1.126",
-        "commit": {
-          "sha": "cb5dfba3368b4d558f2e0357acbc2e455a3f8466",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/cb5dfba3368b4d558f2e0357acbc2e455a3f8466"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjEuMTI2"
-      },
-      {
-        "name": "v1.1.125",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.1.125",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.1.125",
-        "commit": {
-          "sha": "f880f6d61dfaf1b65e53d86c6f5b99530327920c",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/f880f6d61dfaf1b65e53d86c6f5b99530327920c"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjEuMTI1"
-      },
-      {
-        "name": "v1.1.124",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.1.124",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.1.124",
-        "commit": {
-          "sha": "573deda87b0cb3de0d058ba92b996ce35ebbccad",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/573deda87b0cb3de0d058ba92b996ce35ebbccad"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjEuMTI0"
-      },
-      {
-        "name": "v1.1.123",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.1.123",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.1.123",
-        "commit": {
-          "sha": "0684d0b5eb261406fc6fde9d8d27c9138d21e81e",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/0684d0b5eb261406fc6fde9d8d27c9138d21e81e"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjEuMTIz"
-      },
-      {
-        "name": "v1.1.121",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.1.121",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.1.121",
-        "commit": {
-          "sha": "23c3bca209ddea16504f32e995d35f260212b7bc",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/23c3bca209ddea16504f32e995d35f260212b7bc"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjEuMTIx"
-      },
-      {
-        "name": "v1.1.120",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.1.120",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.1.120",
-        "commit": {
-          "sha": "b1b0bff8d38549c8d2835e94f16589f4db424523",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/b1b0bff8d38549c8d2835e94f16589f4db424523"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjEuMTIw"
-      },
-      {
-        "name": "v1.1.119",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.1.119",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.1.119",
-        "commit": {
-          "sha": "9945391c3d8419c869436c4c2de17c1fc47da116",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/9945391c3d8419c869436c4c2de17c1fc47da116"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjEuMTE5"
-      },
-      {
-        "name": "v1.1.117",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.1.117",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.1.117",
-        "commit": {
-          "sha": "58efd737d3c1f09fe966b4d7e3afedbbde173f7c",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/58efd737d3c1f09fe966b4d7e3afedbbde173f7c"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjEuMTE3"
-      },
-      {
-        "name": "v1.1.115",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.1.115",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.1.115",
-        "commit": {
-          "sha": "36d28090e2054baac5a9f25d8df6102ef0ec8fa9",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/36d28090e2054baac5a9f25d8df6102ef0ec8fa9"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjEuMTE1"
-      },
-      {
-        "name": "v1.1.114",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.1.114",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.1.114",
-        "commit": {
-          "sha": "1bb7f68564fe565de2927071c79008bd6ede5af5",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/1bb7f68564fe565de2927071c79008bd6ede5af5"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjEuMTE0"
-      },
-      {
-        "name": "v1.1.113",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.1.113",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.1.113",
-        "commit": {
-          "sha": "3645fef3785d903131f8c4b98bc3f6c9aba2efa6",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/3645fef3785d903131f8c4b98bc3f6c9aba2efa6"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjEuMTEz"
-      },
-      {
-        "name": "v1.1.112",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.1.112",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.1.112",
-        "commit": {
-          "sha": "42d8e9611b024823d228c5511ba5e9d4956b33fb",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/42d8e9611b024823d228c5511ba5e9d4956b33fb"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjEuMTEy"
-      },
-      {
-        "name": "v1.1.108",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.1.108",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.1.108",
-        "commit": {
-          "sha": "392a7eb3d28038979a12006a79faaae3354a9f96",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/392a7eb3d28038979a12006a79faaae3354a9f96"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjEuMTA4"
-      },
-      {
-        "name": "v1.1.107",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.1.107",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.1.107",
-        "commit": {
-          "sha": "5730569e72bac9b7b3b77181fc60e92beb1fefd7",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/5730569e72bac9b7b3b77181fc60e92beb1fefd7"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjEuMTA3"
-      },
-      {
-        "name": "v1.1.106",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.1.106",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.1.106",
-        "commit": {
-          "sha": "1df2ebd329df1ece1a5ed485573ea58e5bc6ff97",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/1df2ebd329df1ece1a5ed485573ea58e5bc6ff97"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjEuMTA2"
-      },
-      {
-        "name": "v1.1.102",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.1.102",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.1.102",
-        "commit": {
-          "sha": "2f0abfcf9eb04018e6e92125a70bc28665aa17fe",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/2f0abfcf9eb04018e6e92125a70bc28665aa17fe"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjEuMTAy"
-      },
-      {
-        "name": "v1.1.101",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.1.101",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.1.101",
-        "commit": {
-          "sha": "15fa85d92454f7823febeb68b56038d427e2a7a4",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/15fa85d92454f7823febeb68b56038d427e2a7a4"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjEuMTAx"
-      },
-      {
-        "name": "v1.1.100",
-        "zipball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/zipball/v1.1.100",
-        "tarball_url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/tarball/v1.1.100",
-        "commit": {
-          "sha": "d2ed01706d456c50b7ad114a604dcd7d0142fae3",
-          "url": "https://api.github.com/repos/KhronosGroup/Vulkan-Loader/commits/d2ed01706d456c50b7ad114a604dcd7d0142fae3"
-        },
-        "node_id": "MDM6UmVmMTMyMDQzNDIyOnYxLjEuMTAw"
-      }
-    ]
-query_type: api.github.tags
-git_url: https://github.com/KhronosGroup/Vulkan-Loader.git
-git_tag:
-- 2020-07-20 v1.2.148
-- 2020-07-14 v1.2.147
-- 2020-07-07 v1.2.146
-- 2020-06-22 v1.2.145
-- 2020-05-26 v1.2.141
-- 2020-05-04 v1.2.140
-- 2020-04-08 v1.2.137
-- 2020-03-17 v1.2.135
-- 2020-03-11 v1.2.134
-- 2020-02-17 v1.2.133
-- 2020-01-28 v1.2.132
-- 2020-01-15 v1.2.131
-- 2019-12-10 v1.1.130
-- 2019-11-26 v1.1.129
-- 2019-11-18 v1.1.128
-- 2019-11-04 v1.1.127
-- 2019-10-21 v1.1.126
-- 2019-10-16 v1.1.125
-- 2020-05-26 sdk-1.2.141.0
-- 2019-12-12 sdk-1.1.130.0
-- 2019-10-28 sdk-1.1.126.0
diff --git a/upstream-info/wireshark.yaml b/upstream-info/wireshark.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..40582429cdffa8f41983f200ce2cbd533f5c938c
--- /dev/null
+++ b/upstream-info/wireshark.yaml
@@ -0,0 +1,5 @@
+---
+version_control: git
+src_repo: https://gitlab.com/wireshark/wireshark
+tag_prefix: "wireshark-"
+separator: "."
diff --git a/upstream-info/wpa_supplicant.yaml b/upstream-info/wpa_supplicant.yaml
index 2b5623d81f13f227de962893dde471cb394d103e..3d7575426bed41e67f9e2ff547892fad858023b6 100644
--- a/upstream-info/wpa_supplicant.yaml
+++ b/upstream-info/wpa_supplicant.yaml
@@ -1,10 +1,5 @@
 ---
-version_control: github
-src_repo: mafintosh/wpa_supplicant
-tag_prefix: "^v"
-separator: "."
-git_url: https://github.com/mafintosh/wpa_supplicant.git
-git_tag:
-- 2017-10-04 v1.0.2
-- 2017-09-25 v1.0.1
-- 2017-09-25 v1.0.0
+version_control: git
+src_repo: git://w1.fi/hostap.git
+tag_prefix: "^hostap_"
+separator: "_"
diff --git a/upstream-info/x3270.yaml b/upstream-info/x3270.yaml
index 222f95feeeedecd9f86f4ee76448ce9f4babbdb6..0b3d66d4b9cce886e65a6b7775ec13dea34fd576 100644
--- a/upstream-info/x3270.yaml
+++ b/upstream-info/x3270.yaml
@@ -1,5 +1,5 @@
 ---
-version_control: github
-src_repo: pmattes/x3270
-tag_pattern: (.*)ga*
+version_control: git
+src_repo: https://git.code.sf.net/p/x3270/code
+tag_pattern: "(.*)ga*"
 separator: "."
diff --git a/upstream-info/xcb-proto.yaml b/upstream-info/xcb-proto.yaml
index e9d3c5566d1eafcb52d801faf42d9e9c6c725d9b..6d02cb1f88f25ca26abc65734752d6989b3c0247 100644
--- a/upstream-info/xcb-proto.yaml
+++ b/upstream-info/xcb-proto.yaml
@@ -1,4 +1,4 @@
 version_control: git
 src_repo: https://gitlab.freedesktop.org/xorg/proto/xcbproto.git
-tag_prefix: NA
-separator: .
+tag_prefix: "^xcb-proto-"
+separator: "."
diff --git a/upstream-info/xorg-x11-font-utils.yaml b/upstream-info/xorg-x11-font-utils.yaml
index c97ec61620564b1bf1717e66ebbb2940b70b0926..e600d4b167963857e03a45830d0d2dd1db43ed7f 100644
--- a/upstream-info/xorg-x11-font-utils.yaml
+++ b/upstream-info/xorg-x11-font-utils.yaml
@@ -1,7 +1,6 @@
 ---
 version_control: github
 src_repo: eurolinux-enterprise-linux-sources/xorg-x11-font-utils
-tag_prefix: 
+tag_prefix: "^xorg-x11-font-utils-" 
 separator: "."
 git_url: https://github.com/eurolinux-enterprise-linux-sources/xorg-x11-font-utils.git
-git_tag:
diff --git a/upstream-info/xorg-x11-fonts.yaml b/upstream-info/xorg-x11-fonts.yaml
index e4d9ee37eda0ca9649de18d508a7854b83708b66..8d6634f30b3a6a307ddad1b49806c92873f2246a 100644
--- a/upstream-info/xorg-x11-fonts.yaml
+++ b/upstream-info/xorg-x11-fonts.yaml
@@ -1,6 +1,6 @@
 ---
 version_control: github
 src_repo: eurolinux-enterprise-linux-sources/xorg-x11-fonts
-tag_prefix: 
+tag_prefix: "^xorg-x11-fonts-" 
 separator: "."
 git_url: https://github.com/eurolinux-enterprise-linux-sources/xorg-x11-fonts.git
diff --git a/upstream-info/xorg-x11-server-utils.yaml b/upstream-info/xorg-x11-server-utils.yaml
index 184ff435945baec45d53dae299bee7d12f919436..71aa696722762a1c39c3e9fe0dac08cde4d6d5cf 100644
--- a/upstream-info/xorg-x11-server-utils.yaml
+++ b/upstream-info/xorg-x11-server-utils.yaml
@@ -1,7 +1,6 @@
 ---
 version_control: github
 src_repo: eurolinux-enterprise-linux-sources/xorg-x11-server-utils
-tag_prefix: 
+tag_prefix: "^xorg-x11-server-utils-" 
 separator: "."
 git_url: https://github.com/eurolinux-enterprise-linux-sources/xorg-x11-server-utils.git
-git_tag:
diff --git a/upstream-info/xorg-x11-xkb-utils.yaml b/upstream-info/xorg-x11-xkb-utils.yaml
index 4babf61c5b385bdc5ad435143497a06eac7c3495..8a3f6147a6944a63f1a0c5ac355973891246d7cb 100644
--- a/upstream-info/xorg-x11-xkb-utils.yaml
+++ b/upstream-info/xorg-x11-xkb-utils.yaml
@@ -1,71 +1,6 @@
 ---
-version_control: git
-src_repo: https://gitlab.freedesktop.org/xorg/app/xkbutils.git
-tag_prefix: "^xkbutils-"
+version_control: github
+src_repo: eurolinux-enterprise-linux-sources/xorg-x11-xkb-utils
+tag_prefix: "^xorg-x11-xkb-utils-" 
 separator: "."
-git_url: https://gitlab.freedesktop.org/xorg/app/xkbutils.git
-git_tag:
-- 2013-02-10 xkbutils-1.0.4
-- 2010-10-30 xkbutils-1.0.3
-- 2009-10-16 xkbutils-1.0.2
-- 2009-10-16 xkbutils-1.0.1
-- 2009-10-16 xkbutils-1.0.0
-- 2004-03-14 xf86-4_4_99_1
-- 2004-03-03 xf86-4_4_0
-- 2003-11-25 xf86-4_3_99_903_special
-- 2004-02-26 xf86-4_3_99_903
-- 2003-11-25 xf86-4_3_99_902
-- 2003-11-25 xf86-4_3_99_901
-- 2003-11-25 xf86-4_3_99_16
-- 2003-11-14 xf86-4_3_0_1
-- 2003-11-25 xf86-012804-2330
-- 2004-04-23 sco_port_update-base
-- 2004-04-23 rel-0-6-1
-- 2004-04-23 lg3d-rel-0-7-0
-- 2004-04-23 lg3d-rel-0-6-2
-- 2004-04-23 lg3d-base
-- 2003-11-14 XORG-MAIN
-- 2005-12-21 XORG-7_1
-- 2005-12-21 XORG-7_0_99_901
-- 2005-12-21 XORG-7_0
-- 2005-12-15 XORG-6_99_99_904
-- 2005-12-03 XORG-6_99_99_903
-- 2005-11-09 XORG-6_99_99_902
-- 2005-07-29 XORG-6_99_99_901
-- 2005-07-29 XORG-6_99_99_900
-- 2004-04-23 XORG-6_8_99_903
-- 2004-04-23 XORG-6_8_99_902
-- 2004-04-23 XORG-6_8_99_901
-- 2004-04-23 XORG-6_8_99_900
-- 2004-04-23 XORG-6_8_99_9
-- 2004-04-23 XORG-6_8_99_8
-- 2004-04-23 XORG-6_8_99_7
-- 2004-04-23 XORG-6_8_99_6
-- 2004-04-23 XORG-6_8_99_5
-- 2004-04-23 XORG-6_8_99_4
-- 2004-04-23 XORG-6_8_99_3
-- 2004-04-23 XORG-6_8_99_2
-- 2004-04-23 XORG-6_8_99_16
-- 2004-04-23 XORG-6_8_99_15
-- 2004-04-23 XORG-6_8_99_14
-- 2004-04-23 XORG-6_8_99_13
-- 2004-04-23 XORG-6_8_99_12
-- 2004-04-23 XORG-6_8_99_11
-- 2004-04-23 XORG-6_8_99_10
-- 2004-04-23 XORG-6_8_99_1
-- 2004-04-23 XORG-6_8_2
-- 2004-04-23 XORG-6_8_1_904
-- 2004-04-23 XORG-6_8_1_903
-- 2004-04-23 XORG-6_8_1_902
-- 2004-04-23 XORG-6_8_1_901
-- 2004-04-23 XORG-6_8_1
-- 2004-04-23 XORG-6_8_0
-- 2004-04-23 XORG-6_7_99_904
-- 2004-04-23 XORG-6_7_99_903
-- 2004-04-23 XORG-6_7_99_902
-- 2004-04-23 XORG-6_7_99_901
-- 2004-04-23 XORG-6_7_99_2
-- 2004-04-23 XORG-6_7_99_1
-- 2004-04-23 XACE-SELINUX-MERGE
-- 2003-11-14 PRE_xf86-4_3_0_1
-- 2005-12-03 MODULAR_COPY
+git_url: https://github.com/eurolinux-enterprise-linux-sources/xorg-x11-xkb-utils.git
diff --git a/upstream-info/xsom.yaml b/upstream-info/xsom.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8d3df79b5103e26117dda85f2d0e085bd8dfdaad
--- /dev/null
+++ b/upstream-info/xsom.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: kohsuke/xsom
+tag_prefix: "xsom-"
+separator:
diff --git a/upstream-info/yum-metadata-parser.yaml b/upstream-info/yum-metadata-parser.yaml
index 534d7f4b85db8f1888cb328282ad086d630bd934..4723d21385642cf3846545be4d9a3c649161a5bf 100644
--- a/upstream-info/yum-metadata-parser.yaml
+++ b/upstream-info/yum-metadata-parser.yaml
@@ -1,5 +1,5 @@
 ---
-version_control: github
-src_repo: rpm-software-management/yum-metadata-parser
-tag_prefix:
-separator:
+version_control: git
+src_repo: https://salsa.debian.org/pkg-rpm-team/yum-metadata-parser.git
+tag_prefix: "^upstream/"
+separator: "."