diff --git a/upstream-info/c-ares.yaml b/upstream-info/c-ares.yaml
index c62e88f995b3bac3cbeac4246b0903294ccb8fd6..d0524b1377135ee2b22c39c79f415e7d67fed5b5 100644
--- a/upstream-info/c-ares.yaml
+++ b/upstream-info/c-ares.yaml
@@ -1,7 +1,7 @@
 ---
 version_control: github
 src_repo: c-ares/c-ares
-tag_prefix: curl-
+tag_prefix: cares-
 separator: _
 git_url: https://github.com/c-ares/c-ares.git
 git_tag:
diff --git a/upstream-info/cdrdao.yaml b/upstream-info/cdrdao.yaml
index f000784ed4216c18b9a93f32b162dc28dc6e5f40..4425c0cdb114894228a99880e522d7eaad497906 100644
--- a/upstream-info/cdrdao.yaml
+++ b/upstream-info/cdrdao.yaml
@@ -1,5 +1,4 @@
----
-version_control: NA
-src_repo: NA
-tag_prefix: NA
-separator: NA
+version_control: github
+src_repo: cdrdao/cdrdao
+tag_prefix: rel_
+separator: _
diff --git a/upstream-info/checkpolicy.yaml b/upstream-info/checkpolicy.yaml
index 2fd1c2ade46ac595a36cd41085044c1fda9cfdbd..3012e89f6e1e2fd0ec07efeb3c21b29fe19f2eb5 100644
--- a/upstream-info/checkpolicy.yaml
+++ b/upstream-info/checkpolicy.yaml
@@ -1,7 +1,7 @@
 ---
 version_control: github
 src_repo: SELinuxProject/selinux
-tag_prefix: "^v"
+tag_prefix: "checkpolicy-"
 separator: "."
 git_url: https://github.com/SELinuxProject/selinux.git
 git_tag:
diff --git a/upstream-info/chrpath.yaml b/upstream-info/chrpath.yaml
index e5f3b054625bb727c7f524043e658a44f9d50c2b..cb8e658d92aed8105322f3b2d5bb8368d4407d92 100644
--- a/upstream-info/chrpath.yaml
+++ b/upstream-info/chrpath.yaml
@@ -1,7 +1,5 @@
 ---
-version_control: git
-src_repo: https://salsa.debian.org/themusicgod1-guest/chrpath.git
-tag_prefix: 
-separator: 
-git_url: https://salsa.debian.org/themusicgod1-guest/chrpath.git
-git_tag:
+version_control: github
+src_repo: jwilk-mirrors/chrpath
+tag_prefix: "RELEASE_"
+separator: "_"
diff --git a/upstream-info/ctags.yaml b/upstream-info/ctags.yaml
index 650d894d68f13994f175876bfe32b276cefd2723..1c5b34910159307ce503a55dcabf385d30256dc5 100644
--- a/upstream-info/ctags.yaml
+++ b/upstream-info/ctags.yaml
@@ -1,5 +1,5 @@
 ---
 version_control: svn
 src_repo: https://svn.code.sf.net/p/ctags/code
-tag_prefix: "^Ctags-"
-separator: _
+tag_prefix: "ctags-"
+separator: .
diff --git a/upstream-info/dbxtool.yaml b/upstream-info/dbxtool.yaml
index f9ce0e7abf554559c8778a67d62b8acbc3ed5cfc..a2ac3dc6b78e83e7319b700a7f77b070e69e75ec 100644
--- a/upstream-info/dbxtool.yaml
+++ b/upstream-info/dbxtool.yaml
@@ -1,16 +1,5 @@
 ---
 version_control: github
 src_repo: vathpela/dbxtool-devel
-tag_prefix: "^v"
-separator: "."
-git_url: https://github.com/vathpela/dbxtool-devel.git
-git_tag:
-- 2017-10-18 dbxtool-8
-- 2016-08-11 dbxtool-7
-- 2014-10-08 dbxtool-0.6
-- 2014-10-07 dbxtool-0.5
-- 2014-08-20 dbxtool-0.4
-- 2014-05-02 dbxtool-0.3
-- 2014-05-02 dbxtool-0.2
-- 2014-05-02 0.3
-- 2014-05-02 0.2
+tag_prefix: "dbxtool-"
+separator: .
diff --git a/upstream-info/docbook-utils.yaml b/upstream-info/docbook-utils.yaml
index 1747380db82c1db53a4a62dc7a68df73989849b9..b71e0601c55d93bc5907c5bf031f4e60ce326d5f 100644
--- a/upstream-info/docbook-utils.yaml
+++ b/upstream-info/docbook-utils.yaml
@@ -1,6 +1,6 @@
----
-version_control: NA
-src_repo: NA
-tag_prefix: NA
-separator: NA
+version_control: ftp
+src_repo: https://ftp.osuosl.org/pub/blfs/conglomeration/docbook-utils
+tag_pattern: docbook-utils-(.*).tar.gz 
+separator: .
 download: https://sourceware.org/ftp/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz
+mirror: true
diff --git a/upstream-info/docker.yaml b/upstream-info/docker.yaml
index 5abe2c4adecef7490d97ddaddd1a47964cf30ff5..2d84a674f3c500b010bd2b94556290ad0f970a9a 100644
--- a/upstream-info/docker.yaml
+++ b/upstream-info/docker.yaml
@@ -1,6 +1,6 @@
 ---
 version_control: github
-src_repo: docker
+src_repo: docker/docker-ce
 tag_prefix: "^v"
 separator: "."
-git_url: https://github.com/docker.git
+git_url: https://github.com/docker/docker-ce.git
diff --git a/upstream-info/dtc.yaml b/upstream-info/dtc.yaml
index 478790ac4fb1b0cef7563c54e40e2101569e1ede..7d70d3d5ed7d82ec75b5fef04d4b5464a6526071 100644
--- a/upstream-info/dtc.yaml
+++ b/upstream-info/dtc.yaml
@@ -1,17 +1,6 @@
 ---
 version_control: github
-src_repo: devicetree-org/devicetree-specification
+src_repo: dgibson/dtc
 tag_prefix: "^v"
 separator: "."
-git_url: https://github.com/devicetree-org/devicetree-specification.git
-git_tag:
-- 2020-02-13 v0.3
-- 2017-12-20 v0.2
-- 2017-12-20 v0.2-rc1
-- 2017-12-18 v0.2-pre4
-- 2017-12-12 v0.2-pre3
-- 2017-12-07 v0.2-pre2
-- 2016-05-24 v0.1
-- 2016-04-29 v0.1-pre1
-- 2019-04-10 v0.3-rc1
-- 2017-12-01 v0.2-pre
+git_url: https://github.com/dgibson/dtc.git
diff --git a/upstream-info/dvdplusrw-tools.yaml b/upstream-info/dvdplusrw-tools.yaml
index fd1fe6151c846b3a20f5b6ada6f731868158a125..4ae9115fcbcc78b9c6c981612988f818648fb604 100644
--- a/upstream-info/dvdplusrw-tools.yaml
+++ b/upstream-info/dvdplusrw-tools.yaml
@@ -1,6 +1,6 @@
----
-version_control: NA
-src_repo: NA
-tag_prefix: NA
-separator: NA
+version_control: ftp
+src_repo: https://ftp.osuosl.org/pub/blfs/conglomeration/dvd+rw-tools
+tag_pattern: dvd\+rw-tools-(.*).tar.gz 
+separator: .
 download: http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.1.tar.gz
+mirror: true
diff --git a/upstream-info/ed.yaml b/upstream-info/ed.yaml
index 7742eb18bf4301aa83c5077716ff55d75b62612c..e528fd66d022870596106f221da5c79ec12899e4 100644
--- a/upstream-info/ed.yaml
+++ b/upstream-info/ed.yaml
@@ -1,5 +1,4 @@
----
-version_control: NA
-src_repo: https://download.savannah.gnu.org/releases/ed/
-tag_prefix: NA
-separator: NA
+version_control: ftp
+src_repo: https://ftp.gnu.org/gnu/ed
+tag_pattern: ed-(.*).tar..z(2)?.(sig)?
+separator: .
diff --git a/upstream-info/fetchmail.yaml b/upstream-info/fetchmail.yaml
index 78b4175147cd72b5760cf9eaaeb7bac3efd27555..cebd449b4522a36f61c1c657df84367346316f89 100644
--- a/upstream-info/fetchmail.yaml
+++ b/upstream-info/fetchmail.yaml
@@ -2,5 +2,5 @@
 version_control: git
 src_repo: https://gitlab.com/fetchmail/fetchmail
 tag_prefix: "^RELEASE_"
-separator: "."
+separator: "-"
 git_url: https://gitlab.com/fetchmail/fetchmail
diff --git a/upstream-info/fontawesome-fonts.yaml b/upstream-info/fontawesome-fonts.yaml
index 1786c595e8a5fa1666e235f5d39bc40ae407793c..e7ecc11838f4e2de3eb6225c6fcd6787f288e870 100644
--- a/upstream-info/fontawesome-fonts.yaml
+++ b/upstream-info/fontawesome-fonts.yaml
@@ -1,7 +1,7 @@
 ---
 version_control: github
 src_repo: FortAwesome/Font-Awesome
-tag_prefix: "^"
+tag_prefix: "^v"
 separator: "."
 git_url: https://github.com/FortAwesome/Font-Awesome.git
 git_tag:
diff --git a/upstream-info/fprintd.yaml b/upstream-info/fprintd.yaml
index 0e5b2c4cae713ef6174a9ca0d56d7b5c932f6ca7..261eb2941c507f89825b8c9ecd61c987644553bc 100644
--- a/upstream-info/fprintd.yaml
+++ b/upstream-info/fprintd.yaml
@@ -1,8 +1,5 @@
 ---
 version_control: git
-src_repo: https://gitlab.freedesktop.org/libfprint/libfprint
-tag_prefix: "^v"
-separator: "."
-git_url: https://gitlab.freedesktop.org/libfprint/libfprint
-git_tag:
-- 2020-06-08 v1.90.2
+src_repo: https://gitlab.freedesktop.org/libfprint/fprintd
+tag_prefix: V_
+separator: _
diff --git a/upstream-info/gnome-icon-theme.yaml b/upstream-info/gnome-icon-theme.yaml
index f000784ed4216c18b9a93f32b162dc28dc6e5f40..00e59ba65c679229965d0433d5b7ca31e3de8b5e 100644
--- a/upstream-info/gnome-icon-theme.yaml
+++ b/upstream-info/gnome-icon-theme.yaml
@@ -1,5 +1,5 @@
----
-version_control: NA
-src_repo: NA
-tag_prefix: NA
-separator: NA
+version_control: ftp
+src_repo: https://ftp.osuosl.org/pub/blfs/conglomeration/gnome-icon-theme
+tag_pattern: gnome-icon-theme-(.*).tar..z(2)?
+separator: .
+mirror: true
diff --git a/upstream-info/gssproxy.yaml b/upstream-info/gssproxy.yaml
index e7b00f5aa32fa0556601356117b957736307c179..1071e5a04a97fcba06d13dea49b8e934584f0603 100644
--- a/upstream-info/gssproxy.yaml
+++ b/upstream-info/gssproxy.yaml
@@ -1,10 +1,5 @@
 ---
-version_control: git
-src_repo: https://pagure.io/gssproxy.git
+version_control: github
+src_repo: gssapi/gssproxy
 tag_prefix: "^v"
 separator: "."
-git_url: https://pagure.io/gssproxy.git
-git_tag:
-- 2019-04-18 v0.8.2
-- 2019-04-16 v0.8.1
-- 2018-02-09 v0.8.0
diff --git a/upstream-info/hdparm.yaml b/upstream-info/hdparm.yaml
index 5b7047ffc106a25ae200d2e1b96f52e45d7718c5..b3eafb0ede0393c6684047d8d89766503ea5d4f4 100644
--- a/upstream-info/hdparm.yaml
+++ b/upstream-info/hdparm.yaml
@@ -1,5 +1,5 @@
----
-version_control: NA
-src_repo: 
-tag_prefix: 
-separator: 
+version_control: ftp
+src_repo: https://ftp.osuosl.org/pub/blfs/conglomeration/hdparm
+tag_pattern: hdparm-(.*).tar..z(2)?
+separator: .
+mirror: true
diff --git a/upstream-info/iSulad-img.yaml b/upstream-info/iSulad-img.yaml
index e15113e7adda2b995e375add4c363e0ee0b445ec..3d5924e20486f4aa1dd50943223a6122d5dfdf06 100644
--- a/upstream-info/iSulad-img.yaml
+++ b/upstream-info/iSulad-img.yaml
@@ -1,3 +1,4 @@
 ---
 version_control: gitee
 src_repo: openEuler/iSulad-img
+tag_prefix: ^v
diff --git a/upstream-info/ipset.yaml b/upstream-info/ipset.yaml
index 79ebf48aaf54d703d7042f16990149a4f9e412ee..6622ecc9fce92eda76623561b2ba394a40f9df55 100644
--- a/upstream-info/ipset.yaml
+++ b/upstream-info/ipset.yaml
@@ -1,14 +1,6 @@
 ---
 version_control: git
 src_repo: git://git.netfilter.org/ipset.git
-tag_prefix: ipset-
+tag_prefix: ^v
 separator: "."
 git_url: git://git.netfilter.org/ipset.git
-git_tag:
-- 2020-02-22 v7.6
-- 2020-01-09 v7.5
-- 2019-11-01 v7.4
-- 2019-07-23 v7.3
-- 2018-12-10 v7.1
-- 2018-10-27 v7.0
-- 2018-04-10 v6.38
diff --git a/upstream-info/libatasmart.yaml b/upstream-info/libatasmart.yaml
index 513e37b4824665de20441b8861db19ebf20e5386..ba5c2872c0f0ec9a817a36a56f6136328bd16121 100644
--- a/upstream-info/libatasmart.yaml
+++ b/upstream-info/libatasmart.yaml
@@ -1,7 +1,4 @@
----
-version_control: github
-src_repo: Rupan/libatasmart
+version_control: git
+src_repo: http://git.0pointer.net/libatasmart.git
 tag_prefix: "^v"
 separator: "."
-git_url: https://github.com/Rupan/libatasmart.git
-git_tag:
diff --git a/upstream-info/libbonoboui.yaml b/upstream-info/libbonoboui.yaml
index fad4715b49479222d04e68228960038f2ae05ba5..e5eda33c7bc33d40a4167c50693a522d8806c75c 100644
--- a/upstream-info/libbonoboui.yaml
+++ b/upstream-info/libbonoboui.yaml
@@ -1,6 +1,4 @@
----
 version_control: github
 src_repo: Distrotech/libbonoboui
-tag_prefix: "^LIBBONOBOUI"
+tag_prefix: LIBBONOBOUI_
 separator: _
-git_url: https://github.com/Distrotech/libbonoboui.git
diff --git a/upstream-info/libdv.yaml b/upstream-info/libdv.yaml
index d0b4b9c4016421fa463f82d81aff5c0bb7c5309d..4b1a70482ecd05de2aea6bec155f82ef60178d5d 100644
--- a/upstream-info/libdv.yaml
+++ b/upstream-info/libdv.yaml
@@ -1,5 +1,4 @@
----
-version_control: NA
-src_repo: NA
-tag_pattern: NA
-separator: NA
+version_control: git
+src_repo: https://gitlab.com/paulus/libdv
+tag_prefix: libdv_
+separator: _
diff --git a/upstream-info/libdvdnav.yaml b/upstream-info/libdvdnav.yaml
index e1a2f7287071937035713e8f890557dda390da67..d3f26b6ed7ba5982463268b10d37fbe8aa685135 100644
--- a/upstream-info/libdvdnav.yaml
+++ b/upstream-info/libdvdnav.yaml
@@ -1,11 +1,6 @@
 ---
-version_control: github
-src_repo: mirror/libdvdnav
-tag_prefix: "^v"
+version_control: git
+src_repo: https://code.videolan.org/videolan/libdvdnav.git
+tag_prefix: 
 separator: "."
-git_url: https://github.com/mirror/libdvdnav.git
-git_tag:
-- 2015-01-28 5.0.3
-- 2015-01-03 5.0.2
-- 2014-08-28 5.0.1
-- 2014-08-01 5.0.0
+git_url: https://code.videolan.org/videolan/libdvdnav.git
diff --git a/upstream-info/libhbalinux.yaml b/upstream-info/libhbalinux.yaml
index d0b4b9c4016421fa463f82d81aff5c0bb7c5309d..f1d2dee80c3eeb6be1a6245118dfd5cc9d2394fb 100644
--- a/upstream-info/libhbalinux.yaml
+++ b/upstream-info/libhbalinux.yaml
@@ -1,5 +1,4 @@
----
-version_control: NA
-src_repo: NA
-tag_pattern: NA
-separator: NA
+version_control: github
+src_repo: cleech/libhbalinux
+tag_prefix: ^v
+separator: .
diff --git a/upstream-info/libmad.yaml b/upstream-info/libmad.yaml
index d0b4b9c4016421fa463f82d81aff5c0bb7c5309d..9c8d800d0045bd83fb6d0cb80394497cedbd94f2 100644
--- a/upstream-info/libmad.yaml
+++ b/upstream-info/libmad.yaml
@@ -1,5 +1,5 @@
----
-version_control: NA
-src_repo: NA
-tag_pattern: NA
-separator: NA
+version_control: ftp
+src_repo: https://ftp.osuosl.org/pub/blfs/conglomeration/libmad
+tag_pattern: libmad-(.*).tar.gz
+separator: .
+mirror: true
diff --git a/upstream-info/libmng.yaml b/upstream-info/libmng.yaml
index b0ff79f9bfff4e85f3244d9007293a5999ce5cac..321ca283cee533104c1017ee364ef076e3495deb 100644
--- a/upstream-info/libmng.yaml
+++ b/upstream-info/libmng.yaml
@@ -1,6 +1,6 @@
----
-version_control: NA
-src_repo: 
-tag_prefix: 
-separator: "."
+version_control: ftp
+src_repo: https://ftp.osuosl.org/pub/blfs/conglomeration/libmng
+tag_pattern: libmng-(.*).tar..z(2)?
+separator: .
 url: https://sourceforge.net/projects/libmng/
+mirror: true
diff --git a/upstream-info/libmpeg2.yaml b/upstream-info/libmpeg2.yaml
index f000784ed4216c18b9a93f32b162dc28dc6e5f40..efef72054956b78cb0480afa7f703a37348db7ad 100644
--- a/upstream-info/libmpeg2.yaml
+++ b/upstream-info/libmpeg2.yaml
@@ -1,5 +1,5 @@
----
-version_control: NA
-src_repo: NA
-tag_prefix: NA
-separator: NA
+version_control: ftp
+src_repo: https://ftp.osuosl.org/pub/blfs/conglomeration/libmpeg2
+tag_pattern: libmpeg2-(.*).tar.gz
+separator: .
+mirror: true
diff --git a/upstream-info/liboauth.yaml b/upstream-info/liboauth.yaml
index 63799ff31a23e2caa27ef8aa491097a976e8d687..85514534e79323989d55c2938cc8fab4503da477 100644
--- a/upstream-info/liboauth.yaml
+++ b/upstream-info/liboauth.yaml
@@ -1,5 +1,5 @@
 ---
-version_control: svn
-src_repo: https://svn.code.sf.net/p/liboauth/code
-tag_prefix: 
+version_control: github
+src_repo: x42/liboauth
+tag_prefix: ^v 
 separator: 
diff --git a/upstream-info/libqb.yaml b/upstream-info/libqb.yaml
index 1c5912aea46de03d9eea71fb3d9ce19cdb86b9f2..c685b085d172ce04276fa97b0c8e916cf4574ea0 100644
--- a/upstream-info/libqb.yaml
+++ b/upstream-info/libqb.yaml
@@ -1,12 +1,6 @@
 ---
 version_control: github
 src_repo: ClusterLabs/libqb
-tag_prefix: "^"
+tag_prefix: "^v"
 separator: "."
 git_url: https://github.com/ClusterLabs/libqb.git
-git_tag:
-- 2020-05-04 v2.0.0
-- 2020-03-18 v1.9.1
-- 2019-12-12 v1.9.0
-- 2017-12-21 v1.0.3
-- 2019-12-11 1.9.0
diff --git a/upstream-info/libsamplerate.yaml b/upstream-info/libsamplerate.yaml
index 96fc9dbf2b97fef8c1bf3a2f532dc8adb6950e12..1429dd3c22b6942286b92719c2324041d223e7eb 100644
--- a/upstream-info/libsamplerate.yaml
+++ b/upstream-info/libsamplerate.yaml
@@ -1,6 +1,5 @@
----
-git_url: https://github.com/erikd/libsamplerate
-version_control: NA
-src_repo: erikd/libsamplerate
-tag_prefix: NA
-separator: NA
+version_control: ftp
+src_repo: https://ftp.osuosl.org/pub/blfs/conglomeration/libsamplerate
+tag_pattern: libsamplerate-(.*).tar..z(2)?
+separator: .
+mirror: true
diff --git a/upstream-info/libsemanage.yaml b/upstream-info/libsemanage.yaml
index 8867dc2e6291b9ff25e6fea8bc0652c0fe21e8b3..f4a989c68af182d2e2086b9ab3f485e27bfa0496 100644
--- a/upstream-info/libsemanage.yaml
+++ b/upstream-info/libsemanage.yaml
@@ -1,36 +1,5 @@
 ---
 version_control: github
 src_repo: SELinuxProject/selinux
-tag_prefix: "^v"
-separator: "."
-git_url: https://github.com/SELinuxProject/selinux.git
-git_tag:
-- 2020-07-10 20200710
-- 2020-06-19 20200619
-- 2020-05-18 20200518
-- 2020-06-19 semodule-utils-3.1-rc2
-- 2020-07-10 semodule-utils-3.1
-- 2020-06-19 selinux-sandbox-3.1-rc2
-- 2020-07-10 selinux-sandbox-3.1
-- 2020-06-19 selinux-python-3.1-rc2
-- 2020-07-10 selinux-python-3.1
-- 2020-06-19 selinux-gui-3.1-rc2
-- 2020-07-10 selinux-gui-3.1
-- 2020-06-19 selinux-dbus-3.1-rc2
-- 2020-07-10 selinux-dbus-3.1
-- 2020-06-19 secilc-3.1-rc2
-- 2020-07-10 secilc-3.1
-- 2020-06-19 restorecond-3.1-rc2
-- 2020-07-10 restorecond-3.1
-- 2020-06-19 policycoreutils-3.1-rc2
-- 2020-07-10 policycoreutils-3.1
-- 2020-06-19 mcstrans-3.1-rc2
-- 2020-07-10 mcstrans-3.1
-- 2020-06-19 libsepol-3.1-rc2
-- 2020-07-10 libsepol-3.1
-- 2020-06-19 libsemanage-3.1-rc2
-- 2020-07-10 libsemanage-3.1
-- 2020-06-19 libselinux-3.1-rc2
-- 2020-07-10 libselinux-3.1
-- 2020-06-19 checkpolicy-3.1-rc2
-- 2020-07-10 checkpolicy-3.1
+tag_prefix: libsemanage-
+separator: .
diff --git a/upstream-info/libsepol.yaml b/upstream-info/libsepol.yaml
index 8867dc2e6291b9ff25e6fea8bc0652c0fe21e8b3..221752dc3018f3bd6ffddfb0d1b4c9b8d72a55c7 100644
--- a/upstream-info/libsepol.yaml
+++ b/upstream-info/libsepol.yaml
@@ -1,36 +1,6 @@
 ---
 version_control: github
 src_repo: SELinuxProject/selinux
-tag_prefix: "^v"
+tag_prefix: "libsepol-"
 separator: "."
 git_url: https://github.com/SELinuxProject/selinux.git
-git_tag:
-- 2020-07-10 20200710
-- 2020-06-19 20200619
-- 2020-05-18 20200518
-- 2020-06-19 semodule-utils-3.1-rc2
-- 2020-07-10 semodule-utils-3.1
-- 2020-06-19 selinux-sandbox-3.1-rc2
-- 2020-07-10 selinux-sandbox-3.1
-- 2020-06-19 selinux-python-3.1-rc2
-- 2020-07-10 selinux-python-3.1
-- 2020-06-19 selinux-gui-3.1-rc2
-- 2020-07-10 selinux-gui-3.1
-- 2020-06-19 selinux-dbus-3.1-rc2
-- 2020-07-10 selinux-dbus-3.1
-- 2020-06-19 secilc-3.1-rc2
-- 2020-07-10 secilc-3.1
-- 2020-06-19 restorecond-3.1-rc2
-- 2020-07-10 restorecond-3.1
-- 2020-06-19 policycoreutils-3.1-rc2
-- 2020-07-10 policycoreutils-3.1
-- 2020-06-19 mcstrans-3.1-rc2
-- 2020-07-10 mcstrans-3.1
-- 2020-06-19 libsepol-3.1-rc2
-- 2020-07-10 libsepol-3.1
-- 2020-06-19 libsemanage-3.1-rc2
-- 2020-07-10 libsemanage-3.1
-- 2020-06-19 libselinux-3.1-rc2
-- 2020-07-10 libselinux-3.1
-- 2020-06-19 checkpolicy-3.1-rc2
-- 2020-07-10 checkpolicy-3.1
diff --git a/upstream-info/libsexy.yaml b/upstream-info/libsexy.yaml
index ffa23f8b6b8758c68c15af1553a439b64f536783..77cb1e9c2f698974f8f40205b9cdd9713083915b 100644
--- a/upstream-info/libsexy.yaml
+++ b/upstream-info/libsexy.yaml
@@ -1,6 +1,6 @@
----
-version_control: NA
-src_repo: 
-tag_prefix: 
-separator: "."
+version_control: ftp
+src_repo: https://ftp.osuosl.org/pub/blfs/conglomeration/libsexy
+tag_pattern: libsexy-(.*).tar..z(2)?
+separator: .
 url: https://releases.chipx86.com/libsexy/libsexy/
+mirror: true
diff --git a/upstream-info/libtevent.yaml b/upstream-info/libtevent.yaml
index 06ae8ea5b4e388b4c33095e7bc683e3cf7c8b6ef..f95016de864d09250fc09a427f54e0816c454c18 100644
--- a/upstream-info/libtevent.yaml
+++ b/upstream-info/libtevent.yaml
@@ -1,7 +1,7 @@
 ---
 version_control: github
-src_repo: gooselinux/libtevent
+src_repo: samba-team/samba
 tag_prefix: tevent-
 separator: "."
-git_url: https://github.com/gooselinux/libtevent.git
+git_url: https://github.com/samba-team/samba.git
 git_tag:
diff --git a/upstream-info/libtiff.yaml b/upstream-info/libtiff.yaml
index 20d4618595fba839fe2cb60ce3111aeb519226cc..19bfddd7a8a879609119879b282cbddee51cb505 100644
--- a/upstream-info/libtiff.yaml
+++ b/upstream-info/libtiff.yaml
@@ -1,6 +1,6 @@
 ---
-version_control: github
-src_repo: vadz/libtiff
-tag_prefix: "^Release-v"
+version_control: git
+src_repo: http://gitlab.com/libtiff/libtiff.git
+tag_prefix: "^v"
 separator: "."
 git_url: https://github.com/vadz/libtiff.git
diff --git a/upstream-info/lua-expat.yaml b/upstream-info/lua-expat.yaml
index b784f0db00de75a9f717444d96ec12765f501d59..a348bfdcaafd7b64f50b33410b4099745d6fd21e 100644
--- a/upstream-info/lua-expat.yaml
+++ b/upstream-info/lua-expat.yaml
@@ -1,5 +1,5 @@
 ---
-version_control: NA
-src_repo: http://matthewwild.co.uk/projects/luaexpat/
-tag_prefix: NA
-separator: NA
+version_control: github
+src_repo: LuaDist/luaexpat
+tag_prefix: 
+separator: 
diff --git a/upstream-info/lzo.yaml b/upstream-info/lzo.yaml
index df2e083653dca5b473b60f70ccb3881d66802b65..a78ac2c5f7802aae79450269c1d00db1a7f57ef7 100644
--- a/upstream-info/lzo.yaml
+++ b/upstream-info/lzo.yaml
@@ -1,5 +1,6 @@
----
-version_control: NA
-src_repo: www.oberhumer.com/opensource/lzo/
-tag_prefix: NA
-separator: NA
+version_control: ftp
+src_repo: https://ftp.osuosl.org/pub/blfs/conglomeration/lzo
+tag_pattern: lzo-(.*).tar..z(2)?
+separator: .
+url: www.oberhumer.com/opensource/lzo/
+mirror: true
diff --git a/upstream-info/mcstrans.yaml b/upstream-info/mcstrans.yaml
index 35da45d789a3b8d6aeeee189562a635c4bc46199..f97e0f91108d624d253751ff728ead3ddeacf34e 100644
--- a/upstream-info/mcstrans.yaml
+++ b/upstream-info/mcstrans.yaml
@@ -1,6 +1,6 @@
 ---
-version_control: git
-src_repo: https://src.fedoraproject.org/rpms/mcstrans.git
-tag_prefix: "^mcstrans-"
-separator: "-"
-git_url: https://src.fedoraproject.org/rpms/mcstrans.git
+version_control: github
+src_repo: SELinuxProject/selinux
+tag_prefix: "mcstrans-"
+separator: "."
+git_url: https://github.com/SELinuxProject/selinux
diff --git a/upstream-info/nagios.yaml b/upstream-info/nagios.yaml
index 3e572361367234386ca27b6b7de7e82e4bf6aa91..80b59272a337123f5321129209e8ba98d007adbe 100644
--- a/upstream-info/nagios.yaml
+++ b/upstream-info/nagios.yaml
@@ -1,23 +1,6 @@
 ---
 version_control: github
 src_repo: NagiosEnterprises/nagioscore
-tag_prefix: "^v"
+tag_prefix: "nagios-"
 separator: "."
 git_url: https://github.com/NagiosEnterprises/nagioscore.git
-git_tag:
-- 2017-05-09 nagios-4.3.2
-- 2017-02-23 nagios-4.3.1
-- 2017-02-21 nagios-4.3.0
-- 2016-12-07 release-4.2.4
-- 2017-02-21 release-4.3.0
-- 2020-04-28 nagios-4.4.6
-- 2019-08-20 nagios-4.4.5
-- 2019-07-29 nagios-4.4.4
-- 2019-01-07 nagios-4.4.3rc1
-- 2019-01-15 nagios-4.4.3
-- 2018-08-16 nagios-4.4.2
-- 2018-06-25 nagios-4.4.1
-- 2018-06-19 nagios-4.4.0
-- 2017-08-24 nagios-4.3.4
-- 2017-08-12 nagios-4.3.3
-- 2015-08-19 nagios-4.1.1
diff --git a/upstream-info/netpbm.yaml b/upstream-info/netpbm.yaml
index e3daa18b3ee7b519f2334870c40d6b281c380e7b..7157a9e5caded7ddaf35d6f247e76528ce13ef77 100644
--- a/upstream-info/netpbm.yaml
+++ b/upstream-info/netpbm.yaml
@@ -1,6 +1,5 @@
 ---
-version_control: svn
-src_repo: https://svn.code.sf.net/p/netpbm/code
-tag_dir: release_number
+version_control: github
+src_repo: t6/netpbm
 tag_prefix: "^v"
 separator: "."
diff --git a/upstream-info/nspr.yaml b/upstream-info/nspr.yaml
index 502bbde647b9ed0d934f03c434cd81d975761845..393a9ab873f9a8620fe0431e1196781c28d41d43 100644
--- a/upstream-info/nspr.yaml
+++ b/upstream-info/nspr.yaml
@@ -1,6 +1,6 @@
----
-version_control: NA
-src_repo: NA
-tag_prefix: NA
-separator: NA
+version_control: ftp
+src_repo: https://ftp.osuosl.org/pub/blfs/conglomeration/nspr
+tag_pattern: nspr-(.*).tar.gz
+separator: .
 download: http://www.mozilla.org/projects/nspr
+mirror: true
diff --git a/upstream-info/nvmetcli.yaml b/upstream-info/nvmetcli.yaml
index 0804b85fa7e3dbd2af4b664ca73b64e95b9aff08..a06df321bd76795f98f49434b54b4e676bcf5120 100644
--- a/upstream-info/nvmetcli.yaml
+++ b/upstream-info/nvmetcli.yaml
@@ -1,7 +1,5 @@
 ---
-version_control: git
-src_repo: git://git.infradead.org/users/hch/nvmetcli.git
+version_control: github
+src_repo: JunxiongGuan/nvmetcli
 tag_prefix: "^v"
 separator: "."
-git_url: git://git.infradead.org/users/hch/nvmetcli.git
-git_tag:
diff --git a/upstream-info/obs-server.yaml b/upstream-info/obs-server.yaml
index f000784ed4216c18b9a93f32b162dc28dc6e5f40..73874f34d3a97d2bdf49a4a075182b3e84c535e3 100644
--- a/upstream-info/obs-server.yaml
+++ b/upstream-info/obs-server.yaml
@@ -1,5 +1,4 @@
----
-version_control: NA
-src_repo: NA
-tag_prefix: NA
-separator: NA
+version_control: github
+src_repo: openSUSE/open-build-service
+tag_prefix: 
+separator: .
diff --git a/upstream-info/python-blivet.yaml b/upstream-info/python-blivet.yaml
index 3c071328a5fed2839df88ebe09fb6fbb49b9f1eb..b6a54d4497d0f5e36b9df71699bd3eb2eab61579 100644
--- a/upstream-info/python-blivet.yaml
+++ b/upstream-info/python-blivet.yaml
@@ -1,18 +1,6 @@
 ---
 version_control: github
 src_repo: storaged-project/blivet
-tag_prefix: "^v"
+tag_prefix: "blivet-"
 separator: "."
 git_url: https://github.com/storaged-project/blivet.git
-git_tag:
-- 2016-04-04 blivet-2.0.2-1
-- 2016-04-04 blivet-2.0.2
-- 2016-03-29 blivet-2.0.1-1
-- 2016-03-29 blivet-2.0.1
-- 2016-03-11 blivet-2.0.0-1
-- 2016-03-11 blivet-2.0.0
-- 2016-03-08 blivet-2.0.0-0.1.b1
-- 2016-03-08 blivet-2.0.0.b1
-- 2016-02-25 2.0.0.a1
-- 2016-02-24 blivet-2.0.0-0.1.a1
-- 2016-02-24 blivet-2.0.0.a1
diff --git a/upstream-info/python-gflags.yaml b/upstream-info/python-gflags.yaml
index d6854fbb756ff83b017ed199d5c249134c61f31f..1c2380d5fbc6cc3cdcd180f30701a49aca8225b4 100644
--- a/upstream-info/python-gflags.yaml
+++ b/upstream-info/python-gflags.yaml
@@ -1,19 +1,5 @@
 ---
-version_control: github
-src_repo: google/python-gflags
-tag_prefix: "^v"
-separator: "."
-git_url: https://github.com/google/python-gflags.git
-git_tag:
-- 2016-02-09 python-gflags-3.0.2
-- 2016-02-05 python-gflags-3.0.1
-- 2016-01-14 python-gflags-3.0.0
-- 2017-10-27 3.1.2
-- 2017-01-30 3.1.1
-- 2016-11-01 3.1.0
-- 2016-09-09 3.0.7
-- 2016-08-09 3.0.6
-- 2016-05-11 3.0.5
-- 2016-04-15 3.0.4
-- 2016-04-12 3.0.3
-- 2016-02-09 3.0.2
+version_control: pypi
+src_repo: python-gflags
+tag_prefix:
+separator: .
diff --git a/upstream-info/python-hamcrest.yaml b/upstream-info/python-hamcrest.yaml
index ccd33478b65894fcd68736a9dfcb7022737a0944..f59dc295f68361b416f876d93894570a73661c93 100644
--- a/upstream-info/python-hamcrest.yaml
+++ b/upstream-info/python-hamcrest.yaml
@@ -1,7 +1,7 @@
 ---
 version_control: github
 src_repo: hamcrest/PyHamcrest
-tag_prefix: "^v"
+tag_prefix: "^V"
 separator: "."
 git_url: https://github.com/hamcrest/PyHamcrest.git
 git_tag:
diff --git a/upstream-info/qt5-qtenginio.yaml b/upstream-info/qt5-qtenginio.yaml
index d0b4b9c4016421fa463f82d81aff5c0bb7c5309d..ef3c22b10db8a39f780a607ca1ce80226985dddc 100644
--- a/upstream-info/qt5-qtenginio.yaml
+++ b/upstream-info/qt5-qtenginio.yaml
@@ -1,5 +1,4 @@
----
-version_control: NA
-src_repo: NA
-tag_pattern: NA
-separator: NA
+version_control: github
+src_repo: qt/qtenginio
+tag_prefix: ^v
+separator: .
diff --git a/upstream-info/redland.yaml b/upstream-info/redland.yaml
index db139440210e396eaea5fedeb40d81e718d26132..0d6ca96d7ed4bfcd3ce72514dba99d5af3afee7b 100644
--- a/upstream-info/redland.yaml
+++ b/upstream-info/redland.yaml
@@ -1,9 +1,9 @@
 ---
 version_control: github
-src_repo: dajobe/redland-bindings
-tag_prefix: redland-bindings_
+src_repo: dajobe/librdf
+tag_prefix: redland_
 separator: _
-git_url: https://github.com/dajobe/redland-bindings.git
+git_url: https://github.com/dajobe/libdrf.git
 git_tag:
 - 2014-05-10 redland-bindings_1_0_17_1
 - 2013-01-13 redland-bindings_1_0_16_1
diff --git a/upstream-info/rpmrebuild.yaml b/upstream-info/rpmrebuild.yaml
index 8d3645e37c6f8f21d420d18b82d3536708531dce..d72e094cdbaf0584fdff0c1d49fcbf1cf8e266c3 100644
--- a/upstream-info/rpmrebuild.yaml
+++ b/upstream-info/rpmrebuild.yaml
@@ -1,14 +1,6 @@
 ---
 version_control: git
 src_repo: https://git.code.sf.net/p/rpmrebuild/git
-tag_prefix: "^v"
-separator: _
+tag_prefix: rpmrebuild-
+separator: .
 git_url: https://git.code.sf.net/p/rpmrebuild/git
-git_tag:
-- 2020-02-21 rpmrebuild-2.15
-- 2018-10-19 rpmrebuild-2.14
-- 2018-09-12 rpmrebuild-2.13
-- 2018-07-20 rpmrebuild-2.12-1
-- 2018-07-20 rpmrebuild-2.12
-- 2018-06-10 rpmrebuild-2.11-3
-- 2018-06-10 rpmrebuild-2.11
diff --git a/upstream-info/sblim-sfcCommon.yaml b/upstream-info/sblim-sfcCommon.yaml
index 0d39aec99c936e7a8ee14e29aae290bd9cae51b9..65c50e3b23a3b4c8b227388f7783e370ffd8f0b0 100644
--- a/upstream-info/sblim-sfcCommon.yaml
+++ b/upstream-info/sblim-sfcCommon.yaml
@@ -1,6 +1,5 @@
----
-version_control: NA
+version_control: git
 src_repo: https://git.code.sf.net/p/sblim/sfccommon
-tag_prefix: "^scfCommon_"
-separator: _
+tag_prefix: "sfcCommon_"
+separator: "_"
 git_url: https://sourceforge.net/p/sblim/sfccommon/ci/master/tree
diff --git a/upstream-info/sound-theme-freedesktop.yaml b/upstream-info/sound-theme-freedesktop.yaml
index 562937b469fa99f44811323900467c4edb9bbb5a..1ca2cba0b3f6bd33101f45d5e4911757683a8974 100644
--- a/upstream-info/sound-theme-freedesktop.yaml
+++ b/upstream-info/sound-theme-freedesktop.yaml
@@ -1,6 +1,6 @@
 ---
 version_control: git
 src_repo: https://gitlab.freedesktop.org/xdg/sound-theme-spec.git
-tag_prefix: 
-separator: "."
+tag_prefix: DEFAULT_ICON_THEME_
+separator: _
 git_url: https://gitlab.freedesktop.org/xdg/sound-theme-spec.git
diff --git a/upstream-info/stunnel.yaml b/upstream-info/stunnel.yaml
index f000784ed4216c18b9a93f32b162dc28dc6e5f40..6faecfe50c1036007cce362a7b36a56d165ead1b 100644
--- a/upstream-info/stunnel.yaml
+++ b/upstream-info/stunnel.yaml
@@ -1,5 +1,4 @@
----
-version_control: NA
-src_repo: NA
-tag_prefix: NA
-separator: NA
+version_control: github
+src_repo: mtrojnar/stunnel
+tag_prefix: stunnel-
+separator: .
diff --git a/upstream-info/tcllib.yaml b/upstream-info/tcllib.yaml
index 56bda84be75a206a93ebe83feb573dbaa281b2d1..510e2d3accce8ec8e6135a958ecc4925d00a2968 100644
--- a/upstream-info/tcllib.yaml
+++ b/upstream-info/tcllib.yaml
@@ -1,15 +1,6 @@
 ---
 version_control: github
 src_repo: tcltk/tcllib
-tag_prefix: tcllib_
-separator: _
+tag_prefix: tcllib-
+separator: "-"
 git_url: https://github.com/tcltk/tcllib.git
-git_tag:
-- 2019-08-21 tcllib-1-20-rc-1
-- 2019-12-01 tcllib-1-20
-- 2018-02-17 tcllib-1-19-rc-2
-- 2018-02-14 tcllib-1-19-rc-1
-- 2018-02-13 tcllib-1-19-rc-0
-- 2018-02-17 tcllib-1-19
-- 2018-02-17 release
-- 2017-12-24 magicsplat-1.8.0
diff --git a/upstream-info/tree.yaml b/upstream-info/tree.yaml
index 5b7047ffc106a25ae200d2e1b96f52e45d7718c5..a7cd76282d94bbf665371062121543cf47e5ddf3 100644
--- a/upstream-info/tree.yaml
+++ b/upstream-info/tree.yaml
@@ -1,5 +1,5 @@
----
-version_control: NA
-src_repo: 
-tag_prefix: 
-separator: 
+version_control: ftp
+src_repo: https://ftp.osuosl.org/pub/blfs/conglomeration/tree
+tag_pattern: tree-(.*).tgz
+separator: .
+mirror: true