diff --git a/.gitignore b/.gitignore
index 55a566e..43be971 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/osinfo-db-20170813.tar.xz
+SOURCES/osinfo-db-20180531.tar.xz
diff --git a/.osinfo-db.metadata b/.osinfo-db.metadata
index f173ce3..7c8d9ec 100644
--- a/.osinfo-db.metadata
+++ b/.osinfo-db.metadata
@@ -1 +1 @@
-ed1291ae03627035c13073fb2775051e0f60e2b4 SOURCES/osinfo-db-20170813.tar.xz
+9a4441d6535e7ebc8c85dd9aadda7aec883c2f5e SOURCES/osinfo-db-20180531.tar.xz
diff --git a/SOURCES/add-fedora-27-data.patch b/SOURCES/add-fedora-27-data.patch
deleted file mode 100644
index 985e404..0000000
--- a/SOURCES/add-fedora-27-data.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From 9d70b457c681a53078b49f18f4ba82e4f46ee264 Mon Sep 17 00:00:00 2001
-From: Felipe Borges <feborges@redhat.com>
-Date: Mon, 8 Jan 2018 15:36:53 +0100
-Subject: [PATCH] Add Fedora 27 data
-
----
- os/fedoraproject.org/fedora-27.xml | 124 ++++++++++++++++++++++++++++++++
- 1 file changed, 124 insertions(+)
- create mode 100644 os/fedoraproject.org/fedora-27.xml
-
-diff --git a/os/fedoraproject.org/fedora-27.xml b/os/fedoraproject.org/fedora-27.xml
-new file mode 100644
-index 0000000..07f2594
---- /dev/null
-+++ b/os/fedoraproject.org/fedora-27.xml
-@@ -0,0 +1,124 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<libosinfo version="0.0.1">
-+
-+ <os id="http://fedoraproject.org/fedora/27">
-+ <short-id>fedora27</short-id>
-+ <name>Fedora 27</name>
-+ <version>27</version>
-+ <vendor>Fedora Project</vendor>
-+ <vendor xml:lang="ca">Projecte Fedora</vendor>
-+ <vendor xml:lang="de">Fedora-Projekt</vendor>
-+ <vendor xml:lang="es">Fedora Project</vendor>
-+ <vendor xml:lang="fr">Fedora Project</vendor>
-+ <vendor xml:lang="id">Proyek Fedora</vendor>
-+ <vendor xml:lang="ja">Fedora Project</vendor>
-+ <vendor xml:lang="pl">Projekt Fedora</vendor>
-+ <vendor xml:lang="pt">Projecto Fedora </vendor>
-+ <vendor xml:lang="pt_BR">Projeto Fedora</vendor>
-+ <vendor xml:lang="uk">Проект Fedora</vendor>
-+ <family>linux</family>
-+ <distro>fedora</distro>
-+ <upgrades id="http://fedoraproject.org/fedora/26"/>
-+ <derives-from id="http://fedoraproject.org/fedora/26"/>
-+
-+ <release-date>2017-11-14</release-date>
-+
-+ <variant id="workstation">
-+ <name>Fedora 27 Workstation</name>
-+ </variant>
-+ <variant id="workstation-netinst">
-+ <name>Fedora 27 Workstation</name>
-+ </variant>
-+ <variant id="server">
-+ <name>Fedora 27 Server</name>
-+ </variant>
-+ <variant id="server-netinst">
-+ <name>Fedora 27 Server</name>
-+ </variant>
-+
-+
-+
-+
-+ <media live="true" arch="x86_64">
-+ <variant id="workstation"/>
-+ <url>https://download.fedoraproject.org/pub/fedora/linux/releases/27/Workstation/x86_64/iso/Fedora-Workstation-Live-x86_64-27-1.6.iso</url>
-+ <iso>
-+ <volume-id>Fedora-WS-Live-27.*</volume-id>
-+ <system-id>LINUX</system-id>
-+ </iso>
-+ <kernel>isolinux/vmlinuz</kernel>
-+ <initrd>isolinux/initrd.img</initrd>
-+ </media>
-+
-+
-+ <media arch="x86_64">
-+ <variant id="workstation-netinst"/>
-+ <url>https://download.fedoraproject.org/pub/fedora/linux/releases/27/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-27-1.6.iso</url>
-+ <iso>
-+ <volume-id>Fedora-WS-dvd-x86_64-26</volume-id>
-+ <system-id>LINUX</system-id>
-+ </iso>
-+ <kernel>isolinux/vmlinuz</kernel>
-+ <initrd>isolinux/initrd.img</initrd>
-+ </media>
-+
-+
-+
-+
-+ <media arch="x86_64">
-+ <variant id="server"/>
-+ <url>https://download.fedoraproject.org/pub/fedora/linux/releases/27/Server/x86_64/iso/Fedora-Server-dvd-x86_64-27-1.6.iso</url>
-+ <iso>
-+ <volume-id>Fedora-S-dvd-x86_64-27</volume-id>
-+ <system-id>LINUX</system-id>
-+ <volume-size>2490368000</volume-size>
-+ </iso>
-+ <kernel>isolinux/vmlinuz</kernel>
-+ <initrd>isolinux/initrd.img</initrd>
-+ </media>
-+
-+
-+ <media arch="x86_64">
-+ <variant id="server-netinst"/>
-+ <url>https://download.fedoraproject.org/pub/fedora/linux/releases/27/Server/x86_64/iso/Fedora-Server-netinst-x86_64-27-1.6.iso</url>
-+ <iso>
-+ <volume-id>Fedora-S-dvd-x86_64-27</volume-id>
-+ <system-id>LINUX</system-id>
-+ <volume-size>535822336</volume-size>
-+ </iso>
-+ <kernel>isolinux/vmlinuz</kernel>
-+ <initrd>isolinux/initrd.img</initrd>
-+ </media>
-+
-+ <tree arch="x86_64">
-+ <url>https://download.fedoraproject.org/pub/fedora/linux/releases/27/Server/x86_64/os/</url>
-+ <variant id="server"/>
-+ <treeinfo>
-+ <family>Fedora</family>
-+ <version>27</version>
-+ <arch>x86_64</arch>
-+ </treeinfo>
-+ </tree>
-+
-+
-+
-+ <resources arch="all">
-+ <minimum>
-+ <n-cpus>1</n-cpus>
-+ <cpu>1000000000</cpu>
-+ <ram>1073741824</ram>
-+ <storage>10737418240</storage>
-+ </minimum>
-+
-+ <recommended>
-+ <ram>2147483648</ram>
-+ <storage>21474836480</storage>
-+ </recommended>
-+ </resources>
-+
-+ <installer>
-+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
-+ <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
-+ </installer>
-+ </os>
-+</libosinfo>
-\ No newline at end of file
---
-2.14.3
-
diff --git a/SOURCES/add-opensuse-42.3-and-win2k16.patch b/SOURCES/add-opensuse-42.3-and-win2k16.patch
deleted file mode 100644
index 1a06d02..0000000
--- a/SOURCES/add-opensuse-42.3-and-win2k16.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-From 29f8f91a6a06e4cc0a04a36ecbe6db1ccafb1a0d Mon Sep 17 00:00:00 2001
-From: Felipe Borges <feborges@redhat.com>
-Date: Fri, 2 Feb 2018 14:04:38 +0100
-Subject: [PATCH] Add OpenSUSE Leap 42.3 and Windows Server 2016
-
----
- os/microsoft.com/win-2k16.xml | 78 ++++++++++++++++++++++++++++++++++
- os/opensuse.org/opensuse-42.3.xml | 68 +++++++++++++++++++++++++++++
- 2 files changed, 146 insertions(+)
- create mode 100644 os/microsoft.com/win-2k16.xml
- create mode 100644 os/opensuse.org/opensuse-42.3.xml
-
-diff --git a/os/microsoft.com/win-2k16.xml b/os/microsoft.com/win-2k16.xml
-new file mode 100644
-index 0000000..3dface2
---- /dev/null
-+++ b/os/microsoft.com/win-2k16.xml
-@@ -0,0 +1,78 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<libosinfo version="0.0.1">
-+
-+ <os id="http://microsoft.com/win/2k16">
-+ <short-id>win2k16</short-id>
-+ <name>Microsoft Windows Server 2016</name>
-+ <version>1709</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="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/2k12r2"/>
-+ <upgrades id="http://microsoft.com/win/2k12r2"/>
-+
-+ <variant id="essentials">
-+ <name>Windows Server 2012 R2 Essentials</name>
-+ <name xml:lang="ca">Windows Server 2012 R2 Essentials</name>
-+ <name xml:lang="es">Windows Server 2012 R2 Essentials</name>
-+ <name xml:lang="fr">Windows Server 2012 R2 Essentials</name>
-+ <name xml:lang="id">Windows Server 2012 R2 Essentials</name>
-+ <name xml:lang="pl">Windows Server 2012 R2 Essentials</name>
-+ <name xml:lang="uk">Windows Server 2012 R2 Essentials</name>
-+ </variant>
-+ <variant id="hyperv">
-+ <name>Windows Server 2016 for HyperV</name>
-+ </variant>
-+
-+ <release-date>2017-10-17</release-date>
-+
-+ <media arch="x86_64">
-+ <iso>
-+ <volume-id>(SSS_X64CHK|SSS_X64FRE|SSS_X64FREE)_</volume-id>
-+ <publisher-id>MICROSOFT CORPORATION</publisher-id>
-+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-+ </iso>
-+ </media>
-+ <media arch="x86_64">
-+ <variant id="essentials"/>
-+ <iso>
-+ <volume-id>(SESS_X64FRE)_</volume-id>
-+ <publisher-id>MICROSOFT CORPORATION</publisher-id>
-+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-+ </iso>
-+ </media>
-+ <media arch="x86_64">
-+ <variant id="hyperv"/>
-+ <iso>
-+ <volume-id>(SHV_X64CHK|SHV_X64FRE)_</volume-id>
-+ <publisher-id>MICROSOFT CORPORATION</publisher-id>
-+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-+ </iso>
-+ </media>
-+
-+ <resources arch="x86_64">
-+ <minimum>
-+ <cpu>1400000000</cpu>
-+ <n-cpus>1</n-cpus>
-+ <ram>536870912</ram>
-+ <storage>10737418240</storage>
-+ </minimum>
-+
-+ <recommended>
-+ <cpu>2000000000</cpu>
-+ <ram>2147483648</ram>
-+ <storage>42949672960</storage>
-+ </recommended>
-+ </resources>
-+
-+ </os>
-+</libosinfo>
-\ No newline at end of file
-diff --git a/os/opensuse.org/opensuse-42.3.xml b/os/opensuse.org/opensuse-42.3.xml
-new file mode 100644
-index 0000000..68fb151
---- /dev/null
-+++ b/os/opensuse.org/opensuse-42.3.xml
-@@ -0,0 +1,68 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<libosinfo version="0.0.1">
-+
-+ <os id="http://opensuse.org/opensuse/42.3">
-+ <short-id>opensuse42.3</short-id>
-+ <name>openSUSE Leap 42.3</name>
-+ <version>42.3</version>
-+ <vendor>openSUSE</vendor>
-+ <vendor xml:lang="ca">openSUSE</vendor>
-+ <vendor xml:lang="de">openSUSE</vendor>
-+ <vendor xml:lang="es">openSUSE</vendor>
-+ <vendor xml:lang="fr">openSUSE</vendor>
-+ <vendor xml:lang="id">openSUSE</vendor>
-+ <vendor xml:lang="ja">openSUSE</vendor>
-+ <vendor xml:lang="pl">openSUSE</vendor>
-+ <vendor xml:lang="pt_BR">openSUSE</vendor>
-+ <vendor xml:lang="uk">openSUSE</vendor>
-+ <family>linux</family>
-+ <distro>opensuse</distro>
-+ <upgrades id="http://opensuse.org/opensuse/42.2"/>
-+ <derives-from id="http://opensuse.org/opensuse/42.2"/>
-+
-+ <release-date>2017-07-26</release-date>
-+ <eol-date>2019-01-31</eol-date>
-+
-+ <devices>
-+ <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://pcisig.com/pci/1af4/1050"/>
-+ </devices>
-+
-+ <media arch="x86_64">
-+ <url>http://download.opensuse.org/distribution/leap/42.3/iso/openSUSE-Leap-42.3-DVD-x86_64.iso</url>
-+ <iso>
-+ <volume-id>openSUSE-Leap-42.3-DVD-x86_64*</volume-id>
-+ <system-id>LINUX</system-id>
-+ <publisher-id>SUSE LINUX GmbH</publisher-id>
-+ </iso>
-+ <kernel>boot/x86_64/loader/linux</kernel>
-+ <initrd>boot/x86_64/loader/initrd</initrd>
-+ </media>
-+
-+ <installer>
-+ <script id='http://opensuse.org/opensuse/autoyast/jeos'/>
-+ <script id='http://opensuse.org/opensuse/autoyast/desktop'/>
-+ </installer>
-+
-+ <resources arch="all">
-+ <minimum>
-+ <cpu>1600000000</cpu>
-+ <n-cpus>1</n-cpus>
-+ <ram>1073741824</ram>
-+ <storage>3221225472</storage>
-+ </minimum>
-+ <recommended>
-+ <cpu>2400000000</cpu>
-+ <ram>2147483648</ram>
-+ <storage>17179869184</storage>
-+ </recommended>
-+ </resources>
-+ </os>
-+</libosinfo>
-\ No newline at end of file
---
-2.14.3
-
diff --git a/SOURCES/add-rhel7.5-data.patch b/SOURCES/add-rhel7.5-data.patch
deleted file mode 100644
index 123dd90..0000000
--- a/SOURCES/add-rhel7.5-data.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From f15c93b0edfd34b1130bc114127a154c9c0f176a Mon Sep 17 00:00:00 2001
-From: Felipe Borges <feborges@redhat.com>
-Date: Wed, 6 Dec 2017 13:07:57 +0100
-Subject: [PATCH] Add RHEL 7.5 data
-
----
- os/redhat.com/rhel-7.5.xml | 96 +++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 96 insertions(+)
- create mode 100644 os/redhat.com/rhel-7.5.xml
-
-diff --git a/os/redhat.com/rhel-7.5.xml b/os/redhat.com/rhel-7.5.xml
-new file mode 100644
-index 0000000..297fc45
---- /dev/null
-+++ b/os/redhat.com/rhel-7.5.xml
-@@ -0,0 +1,96 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<libosinfo version="0.0.1">
-+
-+ <os id="http://redhat.com/rhel/7.5">
-+ <short-id>rhel7.5</short-id>
-+ <name>Red Hat Enterprise Linux 7.5</name>
-+ <version>7.5</version>
-+ <vendor>Red Hat, Inc</vendor>
-+ <vendor xml:lang="ca">Red Hat, Inc</vendor>
-+ <vendor xml:lang="de">Red Hat, Inc</vendor>
-+ <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="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>
-+ <codename>Maipo</codename>
-+ <upgrades id="http://redhat.com/rhel/7.4"/>
-+ <derives-from id="http://redhat.com/rhel/7.4"/>
-+
-+ <media arch="x86_64">
-+ <iso>
-+ <system-id>LINUX</system-id>
-+ <volume-id>.*RHEL-7.5.*x86_64.*</volume-id>
-+ </iso>
-+ <kernel>isolinux/vmlinuz</kernel>
-+ <initrd>isolinux/initrd.img</initrd>
-+ </media>
-+
-+ <media arch="aarch64">
-+ <iso>
-+ <system-id>LINUX</system-id>
-+ <volume-id>RHEL-7.5.*aarch64$</volume-id>
-+ </iso>
-+ </media>
-+
-+ <media arch="ppc64">
-+ <iso>
-+ <system-id>PPC</system-id>
-+ <volume-id>RHEL-7.5.*ppc64$</volume-id>
-+ </iso>
-+ </media>
-+
-+ <media arch="ppc64le">
-+ <iso>
-+ <system-id>PPC</system-id>
-+ <volume-id>RHEL-7.5.*ppc64le$</volume-id>
-+ </iso>
-+ </media>
-+
-+ <media arch="s390x">
-+ <iso>
-+ <system-id>LINUX</system-id>
-+ <volume-id>RHEL-7.5.*s390x$</volume-id>
-+ </iso>
-+ </media>
-+
-+ <resources arch="ppc64">
-+ <minimum>
-+ <n-cpus>1</n-cpus>
-+ <cpu>1000000000</cpu>
-+ <ram>2147483648</ram>
-+ <storage>10737418240</storage>
-+ </minimum>
-+
-+ <recommended>
-+ <cpu>400000000</cpu>
-+ <ram>2147483648</ram>
-+ <storage>21474836480</storage>
-+ </recommended>
-+ </resources>
-+
-+ <resources arch="all">
-+ <minimum>
-+ <n-cpus>1</n-cpus>
-+ <cpu>1000000000</cpu>
-+ <ram>1073741824</ram>
-+ <storage>10737418240</storage>
-+ </minimum>
-+
-+ <recommended>
-+ <cpu>400000000</cpu>
-+ <ram>1073741824</ram>
-+ <storage>9663676416</storage>
-+ </recommended>
-+ </resources>
-+
-+ <installer>
-+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
-+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
-+ </installer>
-+ </os>
-+</libosinfo>
-\ No newline at end of file
---
-2.14.3
-
diff --git a/SOURCES/add-rhel7.6-data.patch b/SOURCES/add-rhel7.6-data.patch
new file mode 100644
index 0000000..7c5ba8d
--- /dev/null
+++ b/SOURCES/add-rhel7.6-data.patch
@@ -0,0 +1,115 @@
+From f7ef5a8616c21d57926498c240a6f7d307b529a8 Mon Sep 17 00:00:00 2001
+From: Felipe Borges <feborges@redhat.com>
+Date: Mon, 11 Jun 2018 12:42:04 +0200
+Subject: [PATCH] rhel: Add Red Hat Enterprise Linux 7.6
+
+---
+ os/redhat.com/rhel-7.6.xml | 96 +++++++++++++++++++++++++++++++++
+ 1 file changed, 96 insertions(+)
+ create mode 100644 os/redhat.com/rhel-7.6.xml
+
+diff --git a/os/redhat.com/rhel-7.6.xml b/os/redhat.com/rhel-7.6.xml
+new file mode 100644
+index 0000000..84cf718
+--- /dev/null
++++ b/os/redhat.com/rhel-7.6.xml
+@@ -0,0 +1,96 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<libosinfo version="0.0.1">
++
++ <os id="http://redhat.com/rhel/7.6">
++ <short-id>rhel7.6</short-id>
++ <name>Red Hat Enterprise Linux 7.6</name>
++ <version>7.6</version>
++ <vendor>Red Hat, Inc</vendor>
++ <vendor xml:lang="ca">Red Hat, Inc</vendor>
++ <vendor xml:lang="de">Red Hat, Inc</vendor>
++ <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="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>
++ <codename>Maipo</codename>
++ <upgrades id="http://redhat.com/rhel/7.5"/>
++ <derives-from id="http://redhat.com/rhel/7.5"/>
++
++ <media arch="x86_64">
++ <iso>
++ <system-id>LINUX</system-id>
++ <volume-id>.*RHEL-7.6.*x86_64.*</volume-id>
++ </iso>
++ <kernel>isolinux/vmlinuz</kernel>
++ <initrd>isolinux/initrd.img</initrd>
++ </media>
++
++ <media arch="aarch64">
++ <iso>
++ <system-id>LINUX</system-id>
++ <volume-id>RHEL-7.6.*aarch64$</volume-id>
++ </iso>
++ </media>
++
++ <media arch="ppc64">
++ <iso>
++ <system-id>PPC</system-id>
++ <volume-id>RHEL-7.6.*ppc64$</volume-id>
++ </iso>
++ </media>
++
++ <media arch="ppc64le">
++ <iso>
++ <system-id>PPC</system-id>
++ <volume-id>RHEL-7.6.*ppc64le$</volume-id>
++ </iso>
++ </media>
++
++ <media arch="s390x">
++ <iso>
++ <system-id>LINUX</system-id>
++ <volume-id>RHEL-7.6.*s390x$</volume-id>
++ </iso>
++ </media>
++
++ <resources arch="ppc64">
++ <minimum>
++ <n-cpus>1</n-cpus>
++ <cpu>1000000000</cpu>
++ <ram>2147483648</ram>
++ <storage>10737418240</storage>
++ </minimum>
++
++ <recommended>
++ <cpu>400000000</cpu>
++ <ram>2147483648</ram>
++ <storage>21474836480</storage>
++ </recommended>
++ </resources>
++
++ <resources arch="all">
++ <minimum>
++ <n-cpus>1</n-cpus>
++ <cpu>1000000000</cpu>
++ <ram>1073741824</ram>
++ <storage>10737418240</storage>
++ </minimum>
++
++ <recommended>
++ <cpu>1000000000</cpu>
++ <ram>1073741824</ram>
++ <storage>10737418240</storage>
++ </recommended>
++ </resources>
++
++ <installer>
++ <script id='http://redhat.com/rhel/kickstart/jeos'/>
++ <script id='http://redhat.com/rhel/kickstart/desktop'/>
++ </installer>
++ </os>
++</libosinfo>
+--
+2.17.1
+
diff --git a/SOURCES/osinfo-db-20170813.tar.xz.asc b/SOURCES/osinfo-db-20170813.tar.xz.asc
deleted file mode 100644
index 73fe6db..0000000
--- a/SOURCES/osinfo-db-20170813.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEECbnI/yI+8ROvoGo57pJsK9rMF3sFAlmQZ0AACgkQ7pJsK9rM
-F3vKWhAArdLM9bjhkpxtK1GW22q0xNH6e/SCI/j2OvD9jfvlC08l2I/5qgODjg8/
-NnuUQwfrFeJU49WVS4i6nSyR1JpZ+peS6cM6idcWBkbRfn1osL2i2GnbYv4LWxJs
-Jrn3cwbwDaNHlELO25r81UWcq+Kp7Dt6u81LNsbhWrZN8hps7hrlX/RwzApnHcnQ
-GhMIGdFx28eoZ8D2qwhC4QbyJDLwOhhLUakyhB6C8axpMphtS+UP8s/Q0Y7VHHOq
-6D6iFwGAZEv4wr+LxLbaN40sHYSuvj9m4IztoMT9vOHRuJ/yXsy3VFP+pMhw+E+b
-aIJeCyx75BUjS75TqtYgW0ATGECwIGu/+E9zfLXj17iEaj9K+GVr0K2Gp0u6j0Rk
-CElhjje427BKYNA9VGyBlB7UMKxnqnN75mgEqDLuoqVI8AWD2NuRRDdXeAtX/WAa
-0LBT+FHJak1z8F+oEA1ZIchuTiU77GtIVqC2ofxrsvDpXgRkdoYJ4oPdVd3p+KY6
-3cmC26mlFqoqJeYCDjOn5Httfz3FqvRRlqc2RPN+F6KHapDI/y+1ix7hQp3fK3Sr
-FAw05wJCiAl6OdT+j1wK+yeR0w0iVvKlxg//GYCGh3ToZ9WxvAZ/zeu3T/mkDyL/
-mPkerOScITsKfgIwkDOAcZN0IMOkumNmQvK4EVTMeMndeqVFul0=
-=DrgP
------END PGP SIGNATURE-----
diff --git a/SOURCES/osinfo-db-20180531.tar.xz.asc b/SOURCES/osinfo-db-20180531.tar.xz.asc
new file mode 100644
index 0000000..d2147f8
--- /dev/null
+++ b/SOURCES/osinfo-db-20180531.tar.xz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCAAdFiEEGy6B0w1CsqINNP4WYABGudZGtF0FAlsQUjsACgkQYABGudZG
+tF2juggApJ38EZQNsGwPbT2xngDBVhnAQHD9RdTe+uEaVAbWnSrimzjhZV4MpYy3
+vF0X56N8d6tQZgVFqV8GF7K5CxVmD2c/aodS2M7M4NRpKN5ivAWLl3q+ULE5vOz8
+1Ru7blBTETCc5axEQ/nUNC1ETCbdH/4Ch+dTSK2eUDbM0w/9RSNzbdmJPxCtZW9u
+zzcxfudKWrNP8q0Pdn7dgDrZasO+9adM1S2CMyDfYER+KUo+M6Z2BuIxDVIgTtwU
+lrHkNuAPuui+58/H5LqF3mEzOcl4Kb64+KVjUvjyCVnMWmSGzAYtT1EBdrUkAYaA
+nUCFv/ST0gvQPKOowewHUhoT3WKJ2A==
+=QiUU
+-----END PGP SIGNATURE-----
diff --git a/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec
index c0f7163..99b0648 100644
--- a/SPECS/osinfo-db.spec
+++ b/SPECS/osinfo-db.spec
@@ -4,8 +4,8 @@
Summary: osinfo database files
Name: osinfo-db
-Version: 20170813
-Release: 6%{?dist}
+Version: 20180531
+Release: 1%{?dist}
License: LGPLv2+
Source0: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz
Source1: /https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz.asc
@@ -15,9 +15,7 @@ BuildRequires: osinfo-db-tools
BuildArch: noarch
Requires: hwdata
-Patch0: add-rhel7.5-data.patch
-Patch1: add-fedora-27-data.patch
-Patch2: add-opensuse-42.3-and-win2k16.patch
+Patch0: add-rhel7.6-data.patch
%description
The osinfo database provides information about operating systems and
@@ -26,9 +24,7 @@ provisioning of new virtual machines
%prep
%setup -q
-%patch0 -p1 -b .add-rhel7.5-data
-%patch1 -p1 -b .add-fedora-27-data
-%patch2 -p1 -b .add-opensuse-42.3-and-win2k16
+%patch0 -p1 -b .add-rhel7.6-data
# For us to be able to apply patches on top of a rebase,
# we:
@@ -54,6 +50,11 @@ osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource}
%{_datadir}/osinfo/schema
%changelog
+* Mon Jun 11 2018 Felipe Borges <feborges@redhat.com> - 20180531-1
+- Rebase to 20180531
+- Add RHEL 7.6
+- Resolves: rhbz#1559001, rhbz#1576376
+
* Fri Feb 02 2018 Felipe Borges <feborges@redhat.com> - 20170813-6
- Both files inserted in the previous release were not processed.