diff --git a/SOURCES/0001-rhel-Add-RHEL-8.7-prerelease.patch b/SOURCES/0001-rhel-Add-RHEL-8.7-prerelease.patch
new file mode 100644
index 0000000..d136647
--- /dev/null
+++ b/SOURCES/0001-rhel-Add-RHEL-8.7-prerelease.patch
@@ -0,0 +1,272 @@
+From 5ce5373899c529027aad4d93c54dc127a7d8fcc6 Mon Sep 17 00:00:00 2001
+From: Victor Toso <victortoso@redhat.com>
+Date: Tue, 2 Aug 2022 15:26:05 +0200
+Subject: [PATCH 1/2] rhel: Add RHEL 8.7 (prerelease)
+Content-type: text/plain
+
+Release is planned for November.
+Signed-off-by: Victor Toso <victortoso@redhat.com>
+---
+ os/redhat.com/rhel-8-unknown.xml |  20 ++--
+ os/redhat.com/rhel-8.7.xml       | 171 +++++++++++++++++++++++++++++++
+ 2 files changed, 181 insertions(+), 10 deletions(-)
+ create mode 100644 os/redhat.com/rhel-8.7.xml
+
+diff --git a/os/redhat.com/rhel-8-unknown.xml b/os/redhat.com/rhel-8-unknown.xml
+index 15ea794..75b8742 100644
+--- a/os/redhat.com/rhel-8-unknown.xml
++++ b/os/redhat.com/rhel-8-unknown.xml
+@@ -33,12 +33,12 @@
+     <family>linux</family>
+     <distro>rhel</distro>
+     <codename>Ootpa</codename>
+-    <upgrades id="http://redhat.com/rhel/8.6"/>
+-    <derives-from id="http://redhat.com/rhel/8.6"/>
++    <upgrades id="http://redhat.com/rhel/8.7"/>
++    <derives-from id="http://redhat.com/rhel/8.7"/>
+     <media arch="x86_64">
+       <iso>
+         <system-id>LINUX</system-id>
+-        <volume-id>.*RHEL-8-([7-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id>
++        <volume-id>.*RHEL-8-([8-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id>
+       </iso>
+       <kernel>isolinux/vmlinuz</kernel>
+       <initrd>isolinux/initrd.img</initrd>
+@@ -46,7 +46,7 @@
+     <media arch="aarch64">
+       <iso>
+         <system-id>LINUX</system-id>
+-        <volume-id>RHEL-8-([7-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
++        <volume-id>RHEL-8-([8-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
+       </iso>
+       <kernel>images/pxeboot/vmlinuz</kernel>
+       <initrd>images/pxeboot/initrd.img</initrd>
+@@ -54,7 +54,7 @@
+     <media arch="ppc64le">
+       <iso>
+         <system-id>PPC</system-id>
+-        <volume-id>RHEL[_-]8[_-]([7-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
++        <volume-id>RHEL[_-]8[_-]([8-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
+       </iso>
+       <kernel>ppc/ppc64/vmlinuz</kernel>
+       <initrd>ppc/ppc64/initrd.img</initrd>
+@@ -62,34 +62,34 @@
+     <media arch="s390x">
+       <iso>
+         <system-id>LINUX</system-id>
+-        <volume-id>RHEL-8-([7-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
++        <volume-id>RHEL-8-([8-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
+       </iso>
+     </media>
+     <tree arch="aarch64">
+       <treeinfo>
+         <family>Red Hat Enterprise Linux</family>
+-        <version>^8.([7-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
++        <version>^8.([8-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
+         <arch>aarch64</arch>
+       </treeinfo>
+     </tree>
+     <tree arch="ppc64le">
+       <treeinfo>
+         <family>Red Hat Enterprise Linux</family>
+-        <version>^8.([7-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
++        <version>^8.([8-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+         <arch>ppc64le</arch>
+       </treeinfo>
+     </tree>
+     <tree arch="s390x">
+       <treeinfo>
+         <family>Red Hat Enterprise Linux</family>
+-        <version>^8.([7-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
++        <version>^8.([8-9]|[1-9][0-9])(.([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.([7-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
++        <version>^8.([8-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+         <arch>x86_64</arch>
+       </treeinfo>
+     </tree>
+diff --git a/os/redhat.com/rhel-8.7.xml b/os/redhat.com/rhel-8.7.xml
+new file mode 100644
+index 0000000..b69f8cd
+--- /dev/null
++++ b/os/redhat.com/rhel-8.7.xml
+@@ -0,0 +1,171 @@
++<?xml version="1.0"?>
++<libosinfo version="0.0.1">
++  <!-- Licensed under the GNU General Public License version 2 or later.
++     See http://www.gnu.org/licenses/ for a copy of the license text -->
++  <os id="http://redhat.com/rhel/8.7">
++    <short-id>rhel8.7</short-id>
++    <name>Red Hat Enterprise Linux 8.7</name>
++    <version>8.7</version>
++    <vendor>Red Hat, Inc</vendor>
++    <vendor xml:lang="ka">Red Hat, Inc</vendor>
++    <vendor xml:lang="ko">Red Hat, Inc</vendor>
++    <vendor xml:lang="fi">Red Hat, Inc</vendor>
++    <vendor xml:lang="uk">Red Hat, Inc</vendor>
++    <vendor xml:lang="tr">Red Hat, Inc</vendor>
++    <vendor xml:lang="pt_BR">Red Hat, Inc</vendor>
++    <vendor xml:lang="pl">Red Hat, Inc</vendor>
++    <vendor xml:lang="ja">Red Hat, Inc</vendor>
++    <vendor xml:lang="it">Red Hat, Inc</vendor>
++    <vendor xml:lang="id">Red Hat, Inc</vendor>
++    <vendor xml:lang="fr">Red Hat, Inc</vendor>
++    <vendor xml:lang="es">Red Hat, Inc</vendor>
++    <vendor xml:lang="de">Red Hat, Inc</vendor>
++    <vendor xml:lang="ca">Red Hat, Inc</vendor>
++    <family>linux</family>
++    <distro>rhel</distro>
++    <codename>Ootpa</codename>
++    <upgrades id="http://redhat.com/rhel/8.6"/>
++    <derives-from id="http://redhat.com/rhel/8.6"/>
++    <release-status>prerelease</release-status>
++    <media arch="x86_64">
++      <iso>
++        <system-id>LINUX</system-id>
++        <volume-id>RHEL-8-7-(([0-9]|[1-9][0-9])-)?BaseOS-x86_64</volume-id>
++      </iso>
++      <kernel>isolinux/vmlinuz</kernel>
++      <initrd>isolinux/initrd.img</initrd>
++    </media>
++    <media arch="ppc64le">
++      <iso>
++        <system-id>PPC</system-id>
++        <volume-id>RHEL[_-]8[_-]7[_-](([0-9]|[1-9][0-9])[_-])?BaseOS[_-]ppc64le</volume-id>
++      </iso>
++      <kernel>ppc/ppc64/vmlinuz</kernel>
++      <initrd>ppc/ppc64/initrd.img</initrd>
++    </media>
++    <media arch="aarch64">
++      <iso>
++        <system-id>LINUX</system-id>
++        <volume-id>RHEL-8-7-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64</volume-id>
++      </iso>
++      <kernel>images/pxeboot/vmlinuz</kernel>
++      <initrd>images/pxeboot/initrd.img</initrd>
++    </media>
++    <media arch="s390x">
++      <iso>
++        <system-id>LINUX</system-id>
++        <volume-id>RHEL-8-7-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id>
++      </iso>
++    </media>
++    <tree arch="aarch64">
++      <treeinfo>
++        <family>Red Hat Enterprise Linux</family>
++        <version>^8.7(.([0-9]|[1-9][0-9]))?$</version>
++        <arch>aarch64</arch>
++      </treeinfo>
++    </tree>
++    <tree arch="ppc64le">
++      <treeinfo>
++        <family>Red Hat Enterprise Linux</family>
++        <version>^8.7(.([0-9]|[1-9][0-9]))?$</version>
++        <arch>ppc64le</arch>
++      </treeinfo>
++    </tree>
++    <tree arch="s390x">
++      <treeinfo>
++        <family>Red Hat Enterprise Linux</family>
++        <version>^8.7(.([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.7(.([0-9]|[1-9][0-9]))?$</version>
++        <arch>x86_64</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>
++      <maximum>
++        <n-cpus>768</n-cpus>
++        <ram>35184372088832</ram>
++      </maximum>
++    </resources>
++    <resources arch="x86_64">
++      <minimum>
++        <cpu>1000000000</cpu>
++        <ram>1610612736</ram>
++        <storage>10737418240</storage>
++      </minimum>
++      <recommended>
++        <cpu>1000000000</cpu>
++        <ram>1610612736</ram>
++        <storage>21474836480</storage>
++      </recommended>
++      <maximum>
++        <n-cpus>768</n-cpus>
++        <ram>26388279066624</ram>
++      </maximum>
++      <network-install>
++        <ram>3221225472</ram>
++      </network-install>
++    </resources>
++    <resources arch="s390x">
++      <minimum>
++        <ram>1073741824</ram>
++        <storage>10737418240</storage>
++      </minimum>
++      <recommended>
++        <storage>21474836480</storage>
++      </recommended>
++      <maximum>
++        <n-cpus>340</n-cpus>
++        <ram>17592186044416</ram>
++      </maximum>
++      <network-install>
++        <ram>2147483648</ram>
++      </network-install>
++    </resources>
++    <resources arch="aarch64">
++      <minimum>
++        <ram>2147483648</ram>
++        <storage>10737418240</storage>
++      </minimum>
++      <recommended>
++        <storage>21474836480</storage>
++      </recommended>
++      <maximum>
++        <n-cpus>256</n-cpus>
++        <ram>1649267441664</ram>
++      </maximum>
++    </resources>
++    <resources arch="all">
++      <minimum>
++        <n-cpus>1</n-cpus>
++        <cpu>1000000000</cpu>
++        <ram>1610612736</ram>
++        <storage>10737418240</storage>
++      </minimum>
++      <recommended>
++        <cpu>1000000000</cpu>
++        <ram>1610612736</ram>
++        <storage>21474836480</storage>
++      </recommended>
++    </resources>
++    <installer>
++      <script id="http://redhat.com/rhel/kickstart/jeos"/>
++      <script id="http://redhat.com/rhel/kickstart/desktop"/>
++    </installer>
++  </os>
++</libosinfo>
+-- 
+2.37.1
+
diff --git a/SOURCES/0002-rhel-Add-RHEL-9.1-prerelease.patch b/SOURCES/0002-rhel-Add-RHEL-9.1-prerelease.patch
new file mode 100644
index 0000000..385b077
--- /dev/null
+++ b/SOURCES/0002-rhel-Add-RHEL-9.1-prerelease.patch
@@ -0,0 +1,267 @@
+From d2257154ae08fe8ffb44a50350bc940cb01538a1 Mon Sep 17 00:00:00 2001
+From: Victor Toso <victortoso@redhat.com>
+Date: Tue, 2 Aug 2022 15:27:53 +0200
+Subject: [PATCH 2/2] rhel: Add RHEL 9.1 (prerelease)
+Content-type: text/plain
+
+Release is planned for November.
+
+Signed-off-by: Victor Toso <victortoso@redhat.com>
+---
+ os/redhat.com/rhel-9-unknown.xml |  20 ++--
+ os/redhat.com/rhel-9.1.xml       | 169 +++++++++++++++++++++++++++++++
+ 2 files changed, 179 insertions(+), 10 deletions(-)
+ create mode 100644 os/redhat.com/rhel-9.1.xml
+
+diff --git a/os/redhat.com/rhel-9-unknown.xml b/os/redhat.com/rhel-9-unknown.xml
+index 7940a23..4caff12 100644
+--- a/os/redhat.com/rhel-9-unknown.xml
++++ b/os/redhat.com/rhel-9-unknown.xml
+@@ -32,59 +32,59 @@
+     <family>linux</family>
+     <distro>rhel</distro>
+     <codename>Plow</codename>
+-    <upgrades id="http://redhat.com/rhel/9.0"/>
+-    <derives-from id="http://redhat.com/rhel/9.0"/>
++    <upgrades id="http://redhat.com/rhel/9.1"/>
++    <derives-from id="http://redhat.com/rhel/9.1"/>
+     <media arch="x86_64">
+       <iso>
+-        <volume-id>.*RHEL-9-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id>
++        <volume-id>.*RHEL-9-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id>
+       </iso>
+       <kernel>isolinux/vmlinuz</kernel>
+       <initrd>isolinux/initrd.img</initrd>
+     </media>
+     <media arch="aarch64">
+       <iso>
+-        <volume-id>RHEL-9-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
++        <volume-id>RHEL-9-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
+       </iso>
+       <kernel>images/pxeboot/vmlinuz</kernel>
+       <initrd>images/pxeboot/initrd.img</initrd>
+     </media>
+     <media arch="ppc64le">
+       <iso>
+-        <volume-id>RHEL[_-]9[_-]([1-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
++        <volume-id>RHEL[_-]9[_-]([2-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
+       </iso>
+       <kernel>ppc/ppc64/vmlinuz</kernel>
+       <initrd>ppc/ppc64/initrd.img</initrd>
+     </media>
+     <media arch="s390x">
+       <iso>
+-        <volume-id>RHEL-9-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
++        <volume-id>RHEL-9-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
+       </iso>
+     </media>
+     <tree arch="aarch64">
+       <treeinfo>
+         <family>Red Hat Enterprise Linux</family>
+-        <version>^9.([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
++        <version>^9.([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
+         <arch>aarch64</arch>
+       </treeinfo>
+     </tree>
+     <tree arch="ppc64le">
+       <treeinfo>
+         <family>Red Hat Enterprise Linux</family>
+-        <version>^9.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
++        <version>^9.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+         <arch>ppc64le</arch>
+       </treeinfo>
+     </tree>
+     <tree arch="s390x">
+       <treeinfo>
+         <family>Red Hat Enterprise Linux</family>
+-        <version>^9.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
++        <version>^9.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+         <arch>s390x</arch>
+       </treeinfo>
+     </tree>
+     <tree arch="x86_64">
+       <treeinfo>
+         <family>Red Hat Enterprise Linux</family>
+-        <version>^9.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
++        <version>^9.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+         <arch>x86_64</arch>
+       </treeinfo>
+     </tree>
+diff --git a/os/redhat.com/rhel-9.1.xml b/os/redhat.com/rhel-9.1.xml
+new file mode 100644
+index 0000000..78ce34a
+--- /dev/null
++++ b/os/redhat.com/rhel-9.1.xml
+@@ -0,0 +1,169 @@
++<?xml version="1.0"?>
++<libosinfo version="0.0.1">
++  <!-- Licensed under the GNU General Public License version 2 or later.
++     See http://www.gnu.org/licenses/ for a copy of the license text -->
++  <os id="http://redhat.com/rhel/9.1">
++    <short-id>rhel9.1</short-id>
++    <name>Red Hat Enterprise Linux 9.1</name>
++    <version>9.1</version>
++    <vendor>Red Hat, Inc</vendor>
++    <vendor xml:lang="ka">Red Hat, Inc</vendor>
++    <vendor xml:lang="ko">Red Hat, Inc</vendor>
++    <vendor xml:lang="fi">Red Hat, Inc</vendor>
++    <vendor xml:lang="uk">Red Hat, Inc</vendor>
++    <vendor xml:lang="tr">Red Hat, Inc</vendor>
++    <vendor xml:lang="pt_BR">Red Hat, Inc</vendor>
++    <vendor xml:lang="pl">Red Hat, Inc</vendor>
++    <vendor xml:lang="ja">Red Hat, Inc</vendor>
++    <vendor xml:lang="it">Red Hat, Inc</vendor>
++    <vendor xml:lang="id">Red Hat, Inc</vendor>
++    <vendor xml:lang="fr">Red Hat, Inc</vendor>
++    <vendor xml:lang="es">Red Hat, Inc</vendor>
++    <vendor xml:lang="de">Red Hat, Inc</vendor>
++    <vendor xml:lang="ca">Red Hat, Inc</vendor>
++    <family>linux</family>
++    <distro>rhel</distro>
++    <codename>Plow</codename>
++    <upgrades id="http://redhat.com/rhel/9.0"/>
++    <derives-from id="http://redhat.com/rhel/9.0"/>
++    <release-status>prerelease</release-status>
++    <!-- RHEL 9.1 entries have to cope both with 9.1 and 9.1.x regexes for
++         medias' volume-id and trees' version -->
++    <media arch="x86_64">
++      <iso>
++        <volume-id>RHEL-9-1-(([0-9]|[1-9][0-9])-)?BaseOS-x86_64</volume-id>
++      </iso>
++      <kernel>isolinux/vmlinuz</kernel>
++      <initrd>isolinux/initrd.img</initrd>
++    </media>
++    <media arch="ppc64le">
++      <iso>
++        <volume-id>RHEL[_-]9[_-]1[_-](([0-9]|[1-9][0-9])[_-])?BaseOS[_-]ppc64le</volume-id>
++      </iso>
++      <kernel>ppc/ppc64/vmlinuz</kernel>
++      <initrd>ppc/ppc64/initrd.img</initrd>
++    </media>
++    <media arch="aarch64">
++      <iso>
++        <volume-id>RHEL-9-1-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64</volume-id>
++      </iso>
++      <kernel>images/pxeboot/vmlinuz</kernel>
++      <initrd>images/pxeboot/initrd.img</initrd>
++    </media>
++    <media arch="s390x">
++      <iso>
++        <volume-id>RHEL-9-1-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id>
++      </iso>
++    </media>
++    <tree arch="aarch64">
++      <treeinfo>
++        <family>Red Hat Enterprise Linux</family>
++        <version>^9.1(.([0-9]|[1-9][0-9]))?$</version>
++        <arch>aarch64</arch>
++      </treeinfo>
++    </tree>
++    <tree arch="ppc64le">
++      <treeinfo>
++        <family>Red Hat Enterprise Linux</family>
++        <version>^9.1(.([0-9]|[1-9][0-9]))?$</version>
++        <arch>ppc64le</arch>
++      </treeinfo>
++    </tree>
++    <tree arch="s390x">
++      <treeinfo>
++        <family>Red Hat Enterprise Linux</family>
++        <version>^9.1(.([0-9]|[1-9][0-9]))?$</version>
++        <arch>s390x</arch>
++      </treeinfo>
++    </tree>
++    <tree arch="x86_64">
++      <treeinfo>
++        <family>Red Hat Enterprise Linux</family>
++        <version>^9.1(.([0-9]|[1-9][0-9]))?$</version>
++        <arch>x86_64</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>
++      <maximum>
++        <n-cpus>768</n-cpus>
++        <ram>35184372088832</ram>
++      </maximum>
++    </resources>
++    <resources arch="x86_64">
++      <minimum>
++        <cpu>1000000000</cpu>
++        <ram>1610612736</ram>
++        <storage>10737418240</storage>
++      </minimum>
++      <recommended>
++        <cpu>1000000000</cpu>
++        <ram>1610612736</ram>
++        <storage>21474836480</storage>
++      </recommended>
++      <maximum>
++        <n-cpus>768</n-cpus>
++        <ram>26388279066624</ram>
++      </maximum>
++      <network-install>
++        <ram>3221225472</ram>
++      </network-install>
++    </resources>
++    <resources arch="s390x">
++      <minimum>
++        <ram>1073741824</ram>
++        <storage>10737418240</storage>
++      </minimum>
++      <recommended>
++        <storage>21474836480</storage>
++      </recommended>
++      <maximum>
++        <n-cpus>340</n-cpus>
++        <ram>17592186044416</ram>
++      </maximum>
++      <network-install>
++        <ram>2147483648</ram>
++      </network-install>
++    </resources>
++    <resources arch="aarch64">
++      <minimum>
++        <ram>2147483648</ram>
++        <storage>10737418240</storage>
++      </minimum>
++      <recommended>
++        <storage>21474836480</storage>
++      </recommended>
++      <maximum>
++        <n-cpus>256</n-cpus>
++        <ram>1649267441664</ram>
++      </maximum>
++    </resources>
++    <resources arch="all">
++      <minimum>
++        <n-cpus>1</n-cpus>
++        <cpu>1000000000</cpu>
++        <ram>1610612736</ram>
++        <storage>10737418240</storage>
++      </minimum>
++      <recommended>
++        <cpu>1000000000</cpu>
++        <ram>1610612736</ram>
++        <storage>21474836480</storage>
++      </recommended>
++    </resources>
++    <installer>
++      <script id="http://redhat.com/rhel/kickstart/jeos"/>
++      <script id="http://redhat.com/rhel/kickstart/desktop"/>
++    </installer>
++  </os>
++</libosinfo>
+-- 
+2.37.1
+
diff --git a/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec
index 3b53ead..05c1fc8 100644
--- a/SPECS/osinfo-db.spec
+++ b/SPECS/osinfo-db.spec
@@ -1,14 +1,20 @@
 # -*- rpm-spec -*-
 
+%define PatchedSource ../%{name}-%{version}-patched.tar.xz
+%define ExtractedSource %{name}-%{version}
+
 Summary: osinfo database files
 Name: osinfo-db
 Version: 20220727
-Release: 1%{?dist}
+Release: 2%{?dist}
 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
 URL: http://libosinfo.org/
+Patch0001: 0001-rhel-Add-RHEL-8.7-prerelease.patch
+Patch0002: 0002-rhel-Add-RHEL-9.1-prerelease.patch
 BuildRequires: intltool
+BuildRequires: git-core
 BuildRequires: osinfo-db-tools
 BuildArch: noarch
 Requires: hwdata
@@ -18,8 +24,15 @@ The osinfo database provides information about operating systems and
 hypervisor platforms to facilitate the automated configuration and
 provisioning of new virtual machines
 
+%prep
+%autosetup -S git_am
+
+%build
+rm -rf ../%{ExtractedSource}/.git
+tar -cvJf %{PatchedSource} ../%{ExtractedSource}/
+
 %install
-osinfo-db-import  --root %{buildroot} --dir %{_datadir}/osinfo %{SOURCE0}
+osinfo-db-import  --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource}
 %if 0%{?rhel}
 # Remove the upstream virtio-win / spice-guest-tools drivers
 find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d -exec rm -rf {} +
@@ -37,6 +50,10 @@ find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d -
 %{_datadir}/osinfo/schema
 
 %changelog
+* Tue Aug 02 2022 Victor Toso <victortoso@redhat.com> - 20220727-2
+- Add prereleases: rhel-8.7 and rhel-9.1
+  Resolves: rhbz#2103908
+
 * Thu Jul 28 2022 Victor Toso <victortoso@redhat.com> - 20220727-1
 - Update to new release (v20220727)
   Resolves: rhbz#2083663