diff --git a/SOURCES/0010-rhel-8.0-Update-entry-to-also-match-8.0.x.patch b/SOURCES/0010-rhel-8.0-Update-entry-to-also-match-8.0.x.patch
new file mode 100644
index 0000000..c2c4e09
--- /dev/null
+++ b/SOURCES/0010-rhel-8.0-Update-entry-to-also-match-8.0.x.patch
@@ -0,0 +1,154 @@
+From e7a1af1fd70ceaa4b013ea6186a5c3ca7a47e3e0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
+Date: Wed, 29 May 2019 07:54:04 +0200
+Subject: [PATCH] rhel-8.0: Update entry to also match 8.0.x
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
+---
+ os/redhat.com/rhel-8.0.xml | 94 +++++++++++++++++++++++++++++++++++---
+ 1 file changed, 88 insertions(+), 6 deletions(-)
+
+diff --git a/os/redhat.com/rhel-8.0.xml b/os/redhat.com/rhel-8.0.xml
+index a0faf1b..37033c0 100644
+--- a/os/redhat.com/rhel-8.0.xml
++++ b/os/redhat.com/rhel-8.0.xml
+@@ -11,19 +11,46 @@
+ <vendor xml:lang="es">Red Hat, Inc</vendor>
+ <vendor xml:lang="fr">Red Hat, Inc</vendor>
+ <vendor xml:lang="id">Red Hat, Inc</vendor>
++ <vendor xml:lang="it">Red Hat, Inc</vendor>
+ <vendor xml:lang="ja">Red Hat, Inc</vendor>
+ <vendor xml:lang="pl">Red Hat, Inc</vendor>
+ <vendor xml:lang="pt_BR">Red Hat, Inc</vendor>
+ <vendor xml:lang="uk">Red Hat, Inc</vendor>
+ <family>linux</family>
+ <distro>rhel</distro>
+- <upgrades id="http://redhat.com/rhel/7.5"/>
+- <derives-from id="http://redhat.com/rhel/7.5"/>
++ <codename>Ootpa</codename>
++ <upgrades id="http://redhat.com/rhel/7.6"/>
++
++ <release-date>2018-05-07</release-date>
++
++ <devices>
++ <device id="http://pcisig.com/pci/1b36/0100"/>
++ <device id="http://pcisig.com/pci/8086/2415"/>
++ <device id="http://usb.org/usb/80ee/0021"/>
++ <device id="http://pcisig.com/pci/8086/2668"/>
++ <device id="http://pcisig.com/pci/1af4/1001"/>
++ <device id="http://pcisig.com/pci/1af4/1000"/>
++ <device id="http://pcisig.com/pci/1af4/1003"/>
++ <device id="http://pcisig.com/pci/1af4/1005"/>
++ <device id="http://pcisig.com/pci/1033/0194"/>
++ <device id="http://pcisig.com/pci/1b36/0004"/>
++ <device id="http://pcisig.com/pci/1af4/1041"/>
++ <device id="http://pcisig.com/pci/1af4/1042"/>
++ <device id="http://pcisig.com/pci/1af4/1043"/>
++ <device id="http://pcisig.com/pci/1af4/1044"/>
++ <device id="http://pcisig.com/pci/1af4/1045"/>
++ <device id="http://pcisig.com/pci/1af4/1048"/>
++ <device id="http://pcisig.com/pci/1af4/1049"/>
++ <device id="http://pcisig.com/pci/1af4/1052"/>
++ <device id="http://qemu.org/chipset/x86/q35"/>
++ <device id="http://pcisig.com/pci/8086/10d3"/>
++ <device id="http://pcisig.com/pci/8086/293e"/>
++ </devices>
+
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>
+- <volume-id>RHEL-8-0-BaseOS-x86_64</volume-id>
++ <volume-id>RHEL-8-0-(([0-9]|[1-9][0-9])-)?BaseOS-x86_64</volume-id>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+@@ -32,7 +59,7 @@
+ <media arch="ppc64le">
+ <iso>
+ <system-id>PPC</system-id>
+- <volume-id>RHEL[_-]8[_-]0[_-]BaseOS[_-]ppc64le</volume-id>
++ <volume-id>RHEL[_-]8[_-]0[_-](([0-9]|[1-9][0-9])[_-])?BaseOS[_-]ppc64le</volume-id>
+ </iso>
+ <kernel>ppc/ppc64/vmlinuz</kernel>
+ <initrd>ppc/ppc64/initrd.img</initrd>
+@@ -41,17 +68,72 @@
+ <media arch="aarch64">
+ <iso>
+ <system-id>LINUX</system-id>
+- <volume-id>RHEL-8-0-BaseOS-aarch64</volume-id>
++ <volume-id>RHEL-8-0-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64</volume-id>
+ </iso>
+ </media>
+
+ <media arch="s390x">
+ <iso>
+ <system-id>LINUX</system-id>
+- <volume-id>RHEL-8-0-BaseOS-s390x</volume-id>
++ <volume-id>RHEL-8-0-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id>
+ </iso>
+ </media>
+
++ <tree arch="aarch64">
++ <treeinfo>
++ <family>Red Hat Enterprise Linux</family>
++ <version>^8.0(.([0-9]|[1-9][0-9]))?$</version>
++ <arch>aarch64</arch>
++ </treeinfo>
++ </tree>
++
++ <tree arch="ppc64le">
++ <treeinfo>
++ <family>Red Hat Enterprise Linux</family>
++ <version>^8.0(.([0-9]|[1-9][0-9]))?$</version>
++ <arch>ppc64le</arch>
++ </treeinfo>
++ </tree>
++
++ <tree arch="s390x">
++ <treeinfo>
++ <family>Red Hat Enterprise Linux</family>
++ <version>^8.0(.([0-9]|[1-9][0-9]))?$</version>
++ <arch>s390x</arch>
++ </treeinfo>
++ </tree>
++
++ <tree arch="x86_64">
++ <treeinfo>
++ <family>Red Hat Enterprise Linux</family>
++ <version>^8.0(.([0-9]|[1-9][0-9]))?$</version>
++ <arch>x86_64</arch>
++ </treeinfo>
++ </tree>
++
++ <tree arch="aarch64">
++ <treeinfo>
++ <family>Red Hat Enterprise Linux</family>
++ <version>^8.0(.([0-9]|[1-9][0-9]))?$</version>
++ <arch>aarch64</arch>
++ </treeinfo>
++ </tree>
++
++ <resources arch="ppc64le">
++ <minimum>
++ <n-cpus>1</n-cpus>
++ <cpu>1000000000</cpu>
++ <ram>2147483648</ram>
++ <storage>10737418240</storage>
++ </minimum>
++
++ <recommended>
++ <cpu>4000000000</cpu>
++ <ram>2147483648</ram>
++ <storage>21474836480</storage>
++ </recommended>
++ </resources>
++
+ <resources arch="all">
+ <minimum>
+ <n-cpus>1</n-cpus>
+--
+2.21.0
+
diff --git a/SOURCES/0011-win-Add-win-2k19-entry.patch b/SOURCES/0011-win-Add-win-2k19-entry.patch
new file mode 100644
index 0000000..beca9e7
--- /dev/null
+++ b/SOURCES/0011-win-Add-win-2k19-entry.patch
@@ -0,0 +1,65 @@
+From ef0ed26150d8eab03a00d7f11a955dcfb863d7af Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
+Date: Wed, 29 May 2019 07:55:58 +0200
+Subject: [PATCH] win: Add win-2k19 entry
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
+---
+ os/microsoft.com/win-2k19.xml | 42 +++++++++++++++++++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+ create mode 100644 os/microsoft.com/win-2k19.xml
+
+diff --git a/os/microsoft.com/win-2k19.xml b/os/microsoft.com/win-2k19.xml
+new file mode 100644
+index 0000000..b6ce0c9
+--- /dev/null
++++ b/os/microsoft.com/win-2k19.xml
+@@ -0,0 +1,42 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<libosinfo version="0.0.1">
++
++ <os id="http://microsoft.com/win/2k19">
++ <short-id>win2k19</short-id>
++ <name>Microsoft Windows Server 2019</name>
++ <version>10.0</version>
++ <vendor>Microsoft Corporation</vendor>
++ <vendor xml:lang="ca">Microsoft Corporation</vendor>
++ <vendor xml:lang="de">Microsoft Corporation</vendor>
++ <vendor xml:lang="es">Microsoft Corporation</vendor>
++ <vendor xml:lang="fr">Microsoft Corporation</vendor>
++ <vendor xml:lang="id">Microsoft Corporation</vendor>
++ <vendor xml:lang="it">Microsoft Corporation</vendor>
++ <vendor xml:lang="ja">Microsoft Corporation</vendor>
++ <vendor xml:lang="pl">Microsoft Corporation</vendor>
++ <vendor xml:lang="pt_BR">Microsoft Corporation</vendor>
++ <vendor xml:lang="uk">Корпорація Microsoft</vendor>
++ <family>winnt</family>
++ <distro>win</distro>
++ <derives-from id="http://microsoft.com/win/2k16"/>
++ <upgrades id="http://microsoft.com/win/2k16"/>
++
++ <release-date>2018-10-02</release-date>
++
++ <resources arch="x86_64">
++ <minimum>
++ <cpu>1400000000</cpu>
++ <n-cpus>1</n-cpus>
++ <ram>536870912</ram>
++ <storage>34359738368</storage>
++ </minimum>
++
++ <recommended>
++ <cpu>2000000000</cpu>
++ <ram>2147483648</ram>
++ <storage>42949672960</storage>
++ </recommended>
++ </resources>
++
++ </os>
++</libosinfo>
+--
+2.21.0
+
diff --git a/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec
index 149aab8..b35eb4d 100644
--- a/SPECS/osinfo-db.spec
+++ b/SPECS/osinfo-db.spec
@@ -5,7 +5,7 @@
Summary: osinfo database files
Name: osinfo-db
Version: 20181011
-Release: 8%{?dist}
+Release: 8%{?dist}.1
License: LGPLv2+
Source0: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.xz
Source1: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.xz.asc
@@ -25,6 +25,8 @@ Patch0006: 0006-fedora-Update-f29-data.patch
Patch0007: 0007-silverblue-Update-silverblue29-data.patch
Patch0008: 0008-ubuntu18.10-Update-data-after-release.patch
Patch0009: 0009-silverblue-Adjust-ostree-ref-name-for-f29.patch
+Patch0010: 0010-rhel-8.0-Update-entry-to-also-match-8.0.x.patch
+Patch0011: 0011-win-Add-win-2k19-entry.patch
%description
The osinfo database provides information about operating systems and
@@ -63,6 +65,10 @@ osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource}
%{_datadir}/osinfo/schema
%changelog
+* Wed May 29 2019 Fabiano Fidêncio <fidencio@redhat.com> - 20181011-8.1
+- Resolves: rhbz#1714755 - rhel-8.0.x is not detected as rhel-8.0
+- Resolves: rhbz#1714748 - Add win2019 to libosinfo
+
* Fri Dec 07 2018 Fabiano Fidêncio <fidencio@redhat.com> - 20181011-8
- Resolves: rhbz#1656917 - backport change to support Fedora 29 Silverblue