diff --git a/.gitignore b/.gitignore
index 0295cdd..8226bae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/osinfo-db-20210903.tar.xz
+SOURCES/osinfo-db-20211216.tar.xz
diff --git a/.osinfo-db.metadata b/.osinfo-db.metadata
index e6a1100..e122515 100644
--- a/.osinfo-db.metadata
+++ b/.osinfo-db.metadata
@@ -1 +1 @@
-3f9122832f368aee3b0bd38fbd7d08337552cf33 SOURCES/osinfo-db-20210903.tar.xz
+04e023332abd9e97ce240a8c57fbe27e628dcd8a SOURCES/osinfo-db-20211216.tar.xz
diff --git a/SOURCES/osinfo-db-20210903.tar.xz.asc b/SOURCES/osinfo-db-20210903.tar.xz.asc
deleted file mode 100644
index 01b4002..0000000
--- a/SOURCES/osinfo-db-20210903.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEECbnI/yI+8ROvoGo57pJsK9rMF3sFAmEyIM8ACgkQ7pJsK9rM
-F3s41w/9FpjPBp23pTOvwZiISx4jOlFvWoCWSQPLg7ALhHTRNmrKRk/zTwNRBeHD
-BWN/qr4yluSm9GMnW28ofe97r0UgMdwabKnHLlUSbQnO3637bQqMSD65Uu7WB8s9
-7PtDh0d5sOaST1XZnc0vkv723PoywJM9A5ueKBVEWj+IgwMnQu8pkFz082kgC0T3
-vhyFezJjpaESsOtWnQtDPl+A/3xURvetOYs3MtmNmrQ1OeeCuBENiTzhcTzIEMCV
-9UKZlipuFQVcQloZgz1ZNQQlh+x0YJsUUGLa7gSjJapYFrzi1ejMFbKAxd9YDR0C
-RKPgyC3UrpUQ3Ian/70pnnYUaDsi/JLRTBDP1/7p3oFDc0szWjQv7yk2PKz8yvo9
-nhuUDyyc000kCBlbNx1kSbQNEdnZrOUpCMv0PW1S4TXWHjo1xud8BVOOUf5Jd4FD
-AZCpD6Z4pSb7TyrdX6lJGmlL7tx1il0kLbeeb0LkL2/7dKukmW+gYuYMoZfNi/Co
-gUxhAvn1sYv/WVLK6TDSm3I+4q52EVTcREod8LbSko5Roru9lz8W/sRn+VS57tGD
-+MfouANL8z5dMRp/dXp89Re7d84LqyMORFcFb1hY/KkFhY1KMTqnJpG6oe1Rb1ar
-P+bojHT53LdRHZgXk/67/U4BPWVWHWQCOydqZrizlir0i9zddNM=
-=wNhO
------END PGP SIGNATURE-----
diff --git a/SOURCES/osinfo-db-20211216.tar.xz.asc b/SOURCES/osinfo-db-20211216.tar.xz.asc
new file mode 100644
index 0000000..4db4a1a
--- /dev/null
+++ b/SOURCES/osinfo-db-20211216.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEIG07NS9WbzsOZXLpl9kSPeN6SE8FAmG7BOYACgkQl9kSPeN6
+SE82Vw//ZqSBwYSK6vvIykEQ0p2WliBncIMxuKgAyLmlxopa+9vJ9Cf4LleDMbEz
+Vk9pHTUzhGwuEiYfCBzHiGE6Ud5+nhSj9PV8ECuDlDdcYt1qhfObae/AwkOJXdG4
+QJmF3UJKFZcd8H+mK8xKoPZcO8gIV6Q0PIUOoMEpRHKSIG3dHXUafPHYaubX7DAS
+AxrQnwZbIx6NGXwG0V/VDGLsUS4lhumjkX/cU15+jIH++n70AjOuyDtYXjjeWFn4
+sm5KnxzCgL2enzf+/j9M9FMYlpxgs1TrjNUd7wzPyGEecsjoLNd2PCOJBUALizN6
+aRdS8D1mouPGZMNcKBK8C+J25q6Uf6POvxWwmU5PcapTrMZh2gqwrk29m0OGdE7U
+v6v6gRJ2zGNkZuC7TzeiGLKDRKzHP/Pf1N9257ub2MAlh/erF7kxE0c4890myTg4
+jzCcv7qm++5pGNGEJIiEonmgPwkc0WTf2A49g7GoIM8stoRCHBPKGoGkVv/QMMDv
+vYGN4Mi+vXnCpML43cHzzNYPvoxo5rJ0416X6n1m9heuC0IR1/da6qbKNrXzOcEt
+XeTRoedFY8zJzaNly+m8KAn9aME8K13lscg8Z1Da7P6az2lGKjTs1F0RSV1PBicV
+xVCbQn8hu63Gg4MQ9yH5yrcNnvMGTaqnS55bk5AIEqZ6K3hcrU4=
+=uiRt
+-----END PGP SIGNATURE-----
diff --git a/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec
index f80f051..86bd5b8 100644
--- a/SPECS/osinfo-db.spec
+++ b/SPECS/osinfo-db.spec
@@ -2,7 +2,7 @@
Summary: osinfo database files
Name: osinfo-db
-Version: 20210903
+Version: 20211216
Release: 1%{?dist}
License: LGPLv2+
Source0: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.xz
@@ -37,160 +37,101 @@ find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d -
%{_datadir}/osinfo/schema
%changelog
-* Fri Sep 03 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210903-1
-- Update to new release (v20210903)
+* Thu Dec 16 2021 Victor Toso <victortoso@redhat.com> - 20211216-1
+- Update to new release (v20211216)
+ Resolves: rhbz#1976818
* Mon Aug 09 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210809-1
- Update to new release (v20210806)
-* Fri Aug 06 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210806-1
-- Update to new release (v20210806)
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20210621-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Jun 21 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210621-1
-- Update to new release (v20210621)
-
-* Mon May 31 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210531-1
-- Update to new release (v20210531)
-
-* Mon Apr 26 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210426-1
-- Update to new release (v20210426)
-
-* Fri Mar 12 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210312-1
-- Update to new release (v20210312)
-
* Mon Feb 15 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210215-1
-- Don't distribute upstream virtio-win drivers on RHEL
-- Update to new release (v20210215)
+- Resolves: rhbz#1903300 - rebase osinfo-db to latest fedora
-* Tue Feb 02 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210202-1
-- Update to new release (v20210202)
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20201218-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Dec 18 2020 Fabiano Fidêncio <fidencio@redhat.com> - 20201218-1
-- Update to new release (v20201218)
-
-* Thu Nov 19 2020 Fabiano Fidêncio <fidencio@redhat.com> - 20201119-1
-- Update to new release (v20201119)
-
-* Thu Oct 15 2020 Fabiano Fidêncio <fidencio@redhat.com> - 20201015-1
-- Update to new release (v20201015)
-
-* Sun Oct 11 2020 Fabiano Fidêncio <fidencio@redhat.com> - 20201011-1
-- Update to new release (v20201011)
+* Thu Feb 04 2021 Danilo C. L. de Paula <ddepaula@redhat.com> - 20201218-3
+- Resolves: rhbz#1903300 - rebase osinfo-db to latest fedora
* Thu Aug 13 2020 Fabiano Fidêncio <fidencio@redhat.com> - 20200813-1
-- Update to new release (v20200813)
-
-* Tue Aug 04 2020 Fabiano Fidêncio <fidencio@redhat.com> - 20200804-1
-- Update to new release (V20200804)
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20200529-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+- Update to v20200813 release
+- Related: rhbz#1837756 - osinfo-db is out of date
+- Resolves: rhbz#1868030 - 'osinfo-query os' is missing latest version of Ubuntu and Oracle Linux
-* Sat May 30 2020 Fabiano Fidêncio <fidencio@redhat.com> - 20200529-1
-- Update to new release (v20200529)
+* Tue Aug 04 2020 Fabiano Fidêncio <fidencio@redhat.com> - 20200804-2
+- Remove duplicated virtio1.0-fs device
+- Related: rhbz#1837756 - osinfo-db is out of date
-* Fri May 15 2020 Fabiano Fidêncio <fidencio@redhat.com> - 20200515-1
-- Update to new release (v20200515)
+* Tue Aug 04 2020 Fabiano Fidêncio <fidencio@redhat.com> - 20200804-1
+- Update to v20200804 release
+- Related: rhbz#1837756 - osinfo-db is out of date
-* Wed Mar 25 2020 Fabiano Fidêncio <fidencio@redhat.com> - 20200325-1
-- Update to new release (v20200325)
+* Sun May 31 2020 Fabiano Fidêncio <fidencio@redhat.com> - 20200529-1
+- Update to v20200529 release
+- Resolves: rhbz#1837756 - osinfo-db is out of date
+- Resolves: rhbz#1707119 - Provide information about UEFI support for guests (osinfo-db)
* Mon Feb 03 2020 Fabiano Fidêncio <fidencio@redhat.com> - 20200203-1
-- Update to new release (v20200203)
+- Update to v20200203 release
+- Resolves: rhbz#1780529 - Update to the latest upstream release
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20191125-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+* Tue Dec 10 2019 Fabiano Fidêncio <fidencio@redhat.com> - 20191125-1
+- Updated to v20191125 release
+- Resolves: rhbz#1780529 - Update to the latest upstream release
+- Add rhel8.2 & rhel7.8 entries
+- Remove upstream virtio-win / spice-guest-tools drivers
-* Mon Nov 25 2019 Fabiano Fidêncio <fidencio@redhat.com> - 20191125-1
-- Update to new release (v20191125)
+* Wed Jun 12 2019 Fabiano Fidêncio <fidencio@redhat.com> - 20190611-1
+- Update to v20190611 release
+- Resolves: rhbz#1699990 - Rebase to the latest upstream release
-* Fri Nov 08 2019 Fabiano Fidêncio <fidencio@redhat.com> - 20191108-1
-- Update to new release (v20191108)
+* Thu May 23 2019 Fabiano Fidêncio <fidencio@redhat.com> - 20190504-2
+- Add rhel-8.1 & rhel-7.7 entry
+- Resolves: rhbz#1713245 - Add rhel-8.1 and rhel-7.7 entries
-* Fri Sep 20 2019 Fabiano Fidêncio <fidencio@redhat.com> - 20190920-1
-- Update to new release (v20190920)
+* Fri May 10 2019 Fabiano Fidêncio <fidencio@redhat.com> - 20190504-1
+- Update to v20190504 release
+- Resolves: rhbz#1699990 - Rebase to the latest upstream release
+- Resolves: rhbz#1689817 - virt-manager cannot detect operating system name
+ for rhel8.0.0 tree automatically
+- Resolves: rhbz#1703480 - rhel8.0.x is not detected as rhel8.0
+- Resolves: rhbz#1685364 - Add win2019 to libosinfo
-* Thu Sep 05 2019 Fabiano Fidêncio <fidencio@redhat.com> - 20190905-1
-- Update to new release
-- Resolves: rhbz#1746028 - libosinfo missing rhel7.7 in database
+* Fri Dec 07 2018 Fabiano Fidêncio <fidencio@redhat.com> - 20181011-8
+- Resolves: rhbz#1656917 - backport change to support Fedora 29 Silverblue
-* Mon Aug 05 2019 Fabiano Fidêncio <fidencio@redhat.com> - 20190805-1
-- Update to new release
+* Fri Nov 16 2018 Fabiano Fidêncio <fidencio@redhat.com> - 20181011-7
+- Resolves: rhbz#1650197 - Fix the volume-ids of rhel8.0 entry
+- Resolves: rhbz#1650459 - test-mediauris is failing because of ubuntu change
+- Related: rhbz#1580232 - Add support to RHEL7.6 and RHEL8.0
-* Fri Jul 26 2019 Fabiano Fidêncio <fidencio@redhat.com> - 20190627-1
-- Update to new release
+* Wed Nov 14 2018 Fabiano Fidêncio <fidencio@redhat.com> - 20181011-6
+- Related: rhbz#1580232 - Add support to RHEL7.6 and RHEL8.0
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20190611-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+* Sat Nov 03 2018 Fabiano Fidêncio <fidencio@redhat.com> - 20181011-5
+- Related: rhbz#1580232 - Add support to RHEL7.6 and RHEL8.0
-* Tue Jun 11 2019 Fabiano Fidêncio <fidencio@redhat.com> - 20190611-1
-- Update to new release
+* Thu Nov 01 2018 Fabiano Fidêncio <fidencio@redhat.com> - 20181011-4
+- Related: rhbz#1644738 - Fix a typo in the Fedora 29 XML
-* Sat May 04 2019 Fabiano Fidêncio <fidencio@redhat.org> - 20190504-1
-- Update to new release
+* Thu Nov 01 2018 Fabiano Fidêncio <fidencio@redhat.com> - 20181011-3
+- Resolves: rhbz#1644738 - Latest released Fedora 29 support in RHEL8 instead
+ of Fedora 29 Beta
-* Tue Mar 19 2019 Fabiano Fidêncio <fidencio@redhat.org> - 20190319-1
-- Update to new release
+* Mon Oct 22 2018 Fabiano Fidêncio <fidencio@redhat.com> - 20181011-2
+- Resolves: rhbz#1640458 - Debian Testing should derive-from/upgrade Debian 9
-* Mon Mar 04 2019 Fabiano Fidêncio <fidencio@redhat.org> - 20190304-1
-- Update to new release
+* Thu Oct 11 2018 Fabiano Fidêncio <fidencio@redhat.com> - 20181011-1
+- Related: rhbz#1627271 - Update to 20181011 release
-* Fri Mar 01 2019 Fabiano Fidêncio <fidencio@redhat.org> - 20190301-1
-- Update to new release
+* Fri Sep 21 2018 Fabiano Fidêncio <fidencio@redhat.com> - 20180920-1
+- Related: rhbz#1627271 - Update to 20180920 release
-* Mon Feb 18 2019 Fabiano Fidêncio <fidencio@redhat.org> - 20190218-1
-- Update to new release
+* Mon Sep 10 2018 Fabiano Fidêncio <fidencio@redhat.com> - 20180903-1
+- Related: rhbz#1627271 - Update to 20180903 release
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20190120-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+* Mon Sep 10 2018 Fabiano Fidêncio <fidencio@redhat.com> - 20180612-2
+- Resolves: rhbz#1580232 - Add support to RHEL-7.6 and RHEL-8.0
-* Sun Jan 20 2019 Fabiano Fidêncio <fidencio@redhat.org> - 20190120-1
-- Update to new release
-
-* Fri Dec 14 2018 Fabiano Fidêncio <fidencio@redhat.org> - 20181214-1
-- Update to new release
-
-* Mon Dec 03 2018 Fabiano Fidêncio <fidencio@redhat.org> - 20181203-1
-- Update to new release
-
-* Mon Nov 19 2018 Fabiano Fidêncio <fidencio@redhat.org> - 20181116-1
-- Update to new release
-
-* Thu Nov 01 2018 Fabiano Fidêncio <fabiano@fidencio.org> - 20181101-1
-- Update to new release
-
-* Thu Oct 11 2018 Fabiano Fidêncio <fabiano@fidencio.org> - 20181011-1
-- Update to new release
-
-* Thu Sep 20 2018 Fabiano Fidêncio <fabiano@fidencio.org> - 20180920-1
-- Update to new release
-
-* Mon Sep 03 2018 Fabiano Fidêncio <fabiano@fidencio.org> - 20180903-1
-- Update to new release
-
-* Fri Jul 20 2018 Fabiano Fidêncio <fabiano@fidencio.org> - 20180720-1
-- Update to new release
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20180612-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 12 2018 Fabiano Fidêncio <fabiano@fidencio.org> - 20180612-1
-- Update to new release
-
-* Thu May 31 2018 Fabiano Fidêncio <fabiano@fidencio.org> - 20180531-1
-- Update to new release
-
-* Mon May 14 2018 Fabiano Fidêncio <fabiano@fidencio.org> - 20180514-1
-- Update to new release
-
-* Wed May 02 2018 Fabiano Fidêncio <fabiano@fidencio.org> - 20180502-1
-- Update to new release
+* Wed Jun 20 2018 Daniel P. Berrangé <berrange@redhat.com> - 20180612-1
+- Update to 20180612 release
* Mon Apr 16 2018 Fabiano Fidêncio <fabiano@fidencio.org> - 20180416-1
- Update to new release