diff --git a/.appstream-data.metadata b/.appstream-data.metadata
new file mode 100644
index 0000000..ee426b7
--- /dev/null
+++ b/.appstream-data.metadata
@@ -0,0 +1,2 @@
+8995db49e9fc2efd16a25ac6dde28c36f5cf22cc SOURCES/rhel-9-20210805-icons.tar.gz
+447b60171b4ad5927d1410e671e08b16cfc02c5c SOURCES/rhel-9-20210805.xml.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b7b9e86
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+SOURCES/rhel-9-20210805-icons.tar.gz
+SOURCES/rhel-9-20210805.xml.gz
diff --git a/SOURCES/adobe-flash.xml b/SOURCES/adobe-flash.xml
new file mode 100644
index 0000000..92b5948
--- /dev/null
+++ b/SOURCES/adobe-flash.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
+<components version="0.8" origin="">
+  <component type="addon">
+    <id>flash-player-properties.desktop</id>
+    <pkgname>flash-plugin</pkgname>
+    <metadata_license>CC0-1.0</metadata_license>
+    <name>Adobe Flash</name>
+    <summary>Codec for multimedia and rich content</summary>
+    <description>
+      <p>
+        Adobe Flash Player is for running rich Internet applications and
+        for watching streaming video and listening to audio.
+      </p>
+    </description>
+    <project_license>Proprietary</project_license>
+    <extends>epiphany.desktop</extends>
+    <extends>firefox.desktop</extends>
+    <extends>midori.desktop</extends>
+  </component>
+</components>
diff --git a/SOURCES/fedora-categories.xml b/SOURCES/fedora-categories.xml
new file mode 100644
index 0000000..0ada039
--- /dev/null
+++ b/SOURCES/fedora-categories.xml
@@ -0,0 +1,594 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<components version="0.9" origin="fedora">
+
+  <!-- Apps that show up as featured in GNOME Software category view -->
+  <component type="desktop">
+    <id>org.kde.amarok.desktop</id>
+    <categories>
+      <category>AudioVideo</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Cheese.desktop</id>
+    <categories>
+      <category>AudioVideo</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Totem.desktop</id>
+    <categories>
+      <category>AudioVideo</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.pitivi.Pitivi</id>
+    <categories>
+      <category>AudioVideo</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.videolan.vlc</id>
+    <categories>
+      <category>AudioVideo</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>ardour6.desktop</id>
+    <categories>
+      <category>AudioVideo</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.audacityteam.Audacity</id>
+    <categories>
+      <category>AudioVideo</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>brasero.desktop</id>
+    <categories>
+      <category>AudioVideo</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>easytag.desktop</id>
+    <categories>
+      <category>AudioVideo</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Music.desktop</id>
+    <categories>
+      <category>AudioVideo</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>rhythmbox.desktop</id>
+    <categories>
+      <category>AudioVideo</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>com.rosegardenmusic.rosegarden.desktop</id>
+    <categories>
+      <category>AudioVideo</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.SoundJuicer.desktop</id>
+    <categories>
+      <category>AudioVideo</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Builder.desktop</id>
+    <categories>
+      <category>Development</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Devhelp.desktop</id>
+    <categories>
+      <category>Development</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.dfeet.desktop</id>
+    <categories>
+      <category>Development</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>eclipse.desktop</id>
+    <categories>
+      <category>Development</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.gitg</id>
+    <categories>
+      <category>Development</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Glade</id>
+    <categories>
+      <category>Development</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>monodevelop.desktop</id>
+    <categories>
+      <category>Development</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.gedit.desktop</id>
+    <categories>
+      <category>Development</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>celestia.desktop</id>
+    <categories>
+      <category>Science</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>com.play0ad.zeroad</id>
+    <categories>
+      <category>Game</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>io.github.endless_sky.endless_sky</id>
+    <categories>
+      <category>Game</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>frozen-bubble.desktop</id>
+    <categories>
+      <category>Game</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Chess</id>
+    <categories>
+      <category>Game</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Mahjongg</id>
+    <categories>
+      <category>Game</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Mines</id>
+    <categories>
+      <category>Game</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Sudoku</id>
+    <categories>
+      <category>Game</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Tetravex</id>
+    <categories>
+      <category>Game</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Reversi</id>
+    <categories>
+      <category>Game</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.LightsOff</id>
+    <categories>
+      <category>Game</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>neverball.desktop</id>
+    <categories>
+      <category>Game</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>openarena.desktop</id>
+    <categories>
+      <category>Game</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Quadrapassel</id>
+    <categories>
+      <category>Game</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>redeclipse.desktop</id>
+    <categories>
+      <category>Game</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>sol.desktop</id>
+    <categories>
+      <category>Game</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>supertuxkart.desktop</id>
+    <categories>
+      <category>Game</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.SwellFoop.desktop</id>
+    <categories>
+      <category>Game</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>tremulous.desktop</id>
+    <categories>
+      <category>Game</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.wesnoth.Wesnoth.desktop</id>
+    <categories>
+      <category>Game</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>xonotic.desktop</id>
+    <categories>
+      <category>Game</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.blender.Blender</id>
+    <categories>
+      <category>Graphics</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>darktable.desktop</id>
+    <categories>
+      <category>Graphics</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gimp.GIMP</id>
+    <categories>
+      <category>Graphics</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.inkscape.Inkscape</id>
+    <categories>
+      <category>Graphics</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>libreoffice-draw.desktop</id>
+    <categories>
+      <category>Graphics</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.mypaint.mypaint</id>
+    <categories>
+      <category>Graphics</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.font-viewer.desktop</id>
+    <categories>
+      <category>Graphics</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>scribus.desktop</id>
+    <categories>
+      <category>Graphics</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Shotwell.desktop</id>
+    <categories>
+      <category>Graphics</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>simple-scan.desktop</id>
+    <categories>
+      <category>Graphics</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>chromium-browser.desktop</id>
+    <categories>
+      <category>Network</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Epiphany.desktop</id>
+    <categories>
+      <category>Network</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>firefox.desktop</id>
+    <categories>
+      <category>Network</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Geary.desktop</id>
+    <categories>
+      <category>Network</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>mozilla-thunderbird.desktop</id>
+    <categories>
+      <category>Network</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Polari.desktop</id>
+    <categories>
+      <category>Network</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>pidgin.desktop</id>
+    <categories>
+      <category>Network</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>transmission-gtk.desktop</id>
+    <categories>
+      <category>Network</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>vinagre.desktop</id>
+    <categories>
+      <category>Network</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>abiword.desktop</id>
+    <categories>
+      <category>Office</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>homebank.desktop</id>
+    <categories>
+      <category>Office</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Evolution.desktop</id>
+    <categories>
+      <category>Office</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Geary.desktop</id>
+    <categories>
+      <category>Office</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnucash.GnuCash</id>
+    <categories>
+      <category>Office</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>gnumeric.desktop</id>
+    <categories>
+      <category>Office</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gramps.gramps</id>
+    <categories>
+      <category>Office</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>libreoffice-calc.desktop</id>
+    <categories>
+      <category>Office</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>libreoffice-impress.desktop</id>
+    <categories>
+      <category>Office</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>libreoffice-writer.desktop</id>
+    <categories>
+      <category>Office</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>lyx.desktop</id>
+    <categories>
+      <category>Office</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.octave.Octave.desktop</id>
+    <categories>
+      <category>Education</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.stellarium.Stellarium</id>
+    <categories>
+      <category>Education</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.DiskUtility.desktop</id>
+    <categories>
+      <category>Utility</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>gparted.desktop</id>
+    <categories>
+      <category>Utility</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Boxes.desktop</id>
+    <categories>
+      <category>Utility</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>virt-manager.desktop</id>
+    <categories>
+      <category>Utility</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Notes.desktop</id>
+    <categories>
+      <category>Utility</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.clocks.desktop</id>
+    <categories>
+      <category>Utility</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Documents.desktop</id>
+    <categories>
+      <category>Utility</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Photos.desktop</id>
+    <categories>
+      <category>Utility</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.workrave.workrave</id>
+    <categories>
+      <category>Utility</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.openshot.OpenShot</id>
+    <categories>
+      <category>Utility</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+
+</components>
diff --git a/SOURCES/fedora-popular.xml b/SOURCES/fedora-popular.xml
new file mode 100644
index 0000000..5e545c3
--- /dev/null
+++ b/SOURCES/fedora-popular.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<components version="0.9" origin="fedora">
+
+  <!-- Apps for the GNOME Software "Editor's Picks" list -->
+  <component type="desktop">
+    <id>org.gnome.Notes.desktop</id>
+    <kudos>
+      <kudo>GnomeSoftware::popular</kudo>
+    </kudos>
+  </component>
+  <component type="desktop">
+    <id>calibre-gui.desktop</id>
+    <kudos>
+      <kudo>GnomeSoftware::popular</kudo>
+    </kudos>
+  </component>
+  <component type="desktop">
+    <id>org.gnucash.GnuCash</id>
+    <kudos>
+      <kudo>GnomeSoftware::popular</kudo>
+    </kudos>
+  </component>
+  <component type="desktop">
+    <id>org.inkscape.Inkscape</id>
+    <kudos>
+      <kudo>GnomeSoftware::popular</kudo>
+    </kudos>
+  </component>
+  <component type="desktop">
+    <id>mozilla-thunderbird.desktop</id>
+    <kudos>
+      <kudo>GnomeSoftware::popular</kudo>
+    </kudos>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Geary.desktop</id>
+    <kudos>
+      <kudo>GnomeSoftware::popular</kudo>
+    </kudos>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Maps.desktop</id>
+    <kudos>
+      <kudo>GnomeSoftware::popular</kudo>
+    </kudos>
+  </component>
+  <component type="desktop">
+    <id>pdfmod.desktop</id>
+    <kudos>
+      <kudo>GnomeSoftware::popular</kudo>
+    </kudos>
+  </component>
+  <component type="desktop">
+    <id>scribus.desktop</id>
+    <kudos>
+      <kudo>GnomeSoftware::popular</kudo>
+    </kudos>
+  </component>
+  <component type="desktop">
+    <id>shutter.desktop</id>
+    <kudos>
+      <kudo>GnomeSoftware::popular</kudo>
+    </kudos>
+  </component>
+  <component type="desktop">
+    <id>simple-scan.desktop</id>
+    <kudos>
+      <kudo>GnomeSoftware::popular</kudo>
+    </kudos>
+  </component>
+  <component type="desktop">
+    <id>org.stellarium.Stellarium</id>
+    <kudos>
+      <kudo>GnomeSoftware::popular</kudo>
+    </kudos>
+  </component>
+  <component type="desktop">
+    <id>transmission-gtk.desktop</id>
+    <kudos>
+      <kudo>GnomeSoftware::popular</kudo>
+    </kudos>
+  </component>
+</components>
diff --git a/SOURCES/gstreamer-non-free.xml b/SOURCES/gstreamer-non-free.xml
new file mode 100644
index 0000000..74f99fb
--- /dev/null
+++ b/SOURCES/gstreamer-non-free.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<components version="0.8" origin="">
+  <component priority="-1" type="codec">
+    <id>gstreamer-bad-freeworld</id>
+    <pkgname>gstreamer1-plugins-bad-freeworld</pkgname>
+    <metadata_license>CC0-1.0</metadata_license>
+    <name>GStreamer Multimedia Codecs - Non Free</name>
+    <summary>Multimedia playback for Bluray, DTS, MMS, MP3, MPEG-2 AAC, MPEG-4, Mimic and Siren</summary>
+    <description>
+      <p>
+        This addon includes several additional codecs that are missing
+        something - perhaps a good code review, some documentation, a set of
+        tests, a real live maintainer, or some actual wide use.
+        However, they might be good enough to play your media files.
+      </p>
+      <p>
+        These codecs can be used to encode and decode media files where the
+        format is patent encumbered.
+        Although patent encumbered formats like MP3 are sometimes a way of life
+        you should always try to produce and distribute content using free
+        formats like Ogg and Theora whenever possible.
+      </p>
+      <p>
+        A codec decodes audio and video for for playback or editing and is also
+        used for transmission or storage.
+        Different codecs are used in video-conferencing, streaming media and
+        video editing applications.
+      </p>
+    </description>
+    <icon type="stock">application-x-addon</icon>
+    <categories>
+      <category>Addons</category>
+      <category>Codecs</category>
+    </categories>
+    <keywords>
+      <keyword>Bluray</keyword>
+      <keyword>DTS</keyword>
+      <keyword>MMS</keyword>
+      <keyword>MP3</keyword>
+      <keyword>MPEG-2 AAC</keyword>
+      <keyword>MPEG-4</keyword>
+      <keyword>Mimic</keyword>
+      <keyword>Siren</keyword>
+    </keywords>
+    <project_license>LGPL-2.0 and PatentConcern</project_license>
+    <url type="homepage">http://gstreamer.freedesktop.org/</url>
+    <url type="missing">http://fedoraproject.org/wiki/Multimedia</url>
+  </component>
+  <component priority="-1" type="codec">
+    <id>gstreamer-libav</id>
+    <pkgname>gstreamer1-libav</pkgname>
+    <metadata_license>CC0-1.0</metadata_license>
+    <name>GStreamer Multimedia Codecs - libav</name>
+    <summary>Multimedia playback for a large number of additional formats</summary>
+    <description>
+      <p>
+        This addon supports a large number of audio and video compression
+        formats through the use of the libav library.
+      </p>
+      <p>
+        These codecs can be used for encoding 40+ formats (MPEG, DivX, MPEG4,
+        AC3, DV, ...), decoding 90+ formats (AVI, MPEG, OGG, Matroska, ASF,
+        ...), demuxing 30+ formats, and handling colorspace conversion.
+        Some of these formats are patent encumbered.
+        Although patent encumbered formats like MP3 are sometimes a way of life
+        you should always try to produce and distribute content using free
+        formats like Ogg and Theora whenever possible.
+      </p>
+      <p>
+        A codec decodes audio and video for for playback or editing and is also
+        used for transmission or storage.
+        Different codecs are used in video-conferencing, streaming media and
+        video editing applications.
+      </p>
+    </description>
+    <icon type="stock">application-x-addon</icon>
+    <categories>
+      <category>Addons</category>
+      <category>Codecs</category>
+    </categories>
+    <keywords>
+      <keyword>AC-3</keyword>
+      <keyword>ASF</keyword>
+      <keyword>AVI</keyword>
+      <keyword>DivX</keyword>
+      <keyword>DV</keyword>
+      <keyword>Matroska</keyword>
+      <keyword>MPEG-1</keyword>
+      <keyword>MPEG-2</keyword>
+      <keyword>MPEG-4</keyword>
+      <keyword>OGG</keyword>
+    </keywords>
+    <project_license>LGPL-2.0</project_license>
+    <url type="homepage">http://gstreamer.freedesktop.org/</url>
+    <url type="missing">http://fedoraproject.org/wiki/Multimedia</url>
+  </component>
+  <component priority="-1" type="codec">
+    <id>gstreamer-ugly</id>
+    <pkgname>gstreamer1-plugins-ugly</pkgname>
+    <metadata_license>CC0-1.0</metadata_license>
+    <name>GStreamer Multimedia Codecs - License Issues</name>
+    <summary>Multimedia playback for AC-3, AMR, AMR, ASF, DVD, H.264/MPEG-4 AVC, MP2, MP3, MPEG-2 and RealMedia</summary>
+    <description>
+      <p>
+        This addon includes several good quality codecs that are well tested.
+        These codecs can be used to encode and decode media files where the
+        format is not patent encumbered.
+      </p>
+      <p>
+        There are some important issues with this addon.
+        The codecs are not 100% compatible with the license used by the media
+        framework used on this system.
+        There may also be possible licensing issues with several codecs.
+      </p>
+      <p>
+        A codec decodes audio and video for for playback or editing and is also
+        used for transmission or storage.
+        Different codecs are used in video-conferencing, streaming media and
+        video editing applications.
+      </p>
+    </description>
+    <icon type="stock">application-x-addon</icon>
+    <categories>
+      <category>Addons</category>
+      <category>Codecs</category>
+    </categories>
+    <keywords>
+      <keyword>AC-3</keyword>
+      <keyword>AMR-NB</keyword>
+      <keyword>AMR-WB</keyword>
+      <keyword>ASF</keyword>
+      <keyword>DVD</keyword>
+      <keyword>H.264/MPEG-4 AVC</keyword>
+      <keyword>MP2</keyword>
+      <keyword>MP3</keyword>
+      <keyword>MPEG-2</keyword>
+      <keyword>RealMedia</keyword>
+    </keywords>
+    <project_license>LGPL-2.0 and PatentConcern</project_license>
+    <url type="homepage">http://gstreamer.freedesktop.org/</url>
+    <url type="missing">http://fedoraproject.org/wiki/Multimedia</url>
+  </component>
+</components>
diff --git a/SOURCES/other-repos.xml b/SOURCES/other-repos.xml
new file mode 100644
index 0000000..27bca92
--- /dev/null
+++ b/SOURCES/other-repos.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<components version="0.8" origin="">
+  <component type="generic">
+    <id>adobe-release-x86_64</id>
+    <pkgname>adobe-release-x86_64</pkgname>
+    <metadata_license>CC0-1.0</metadata_license>
+    <name>Adobe</name>
+    <summary>Adobe Repository Configuration</summary>
+  </component>
+  <component type="generic">
+    <id>livna-release</id>
+    <pkgname>livna-release</pkgname>
+    <metadata_license>CC0-1.0</metadata_license>
+    <name>Livna</name>
+    <summary>Livna Repository Configuration</summary>
+  </component>
+  <component type="generic">
+    <id>rpmfusion-free-release</id>
+    <pkgname>rpmfusion-free-release</pkgname>
+    <metadata_license>CC0-1.0</metadata_license>
+    <name>RPM Fusion Free</name>
+    <summary>RPM Fusion Repository Configuration</summary>
+  </component>
+  <component type="generic">
+    <id>rpmfusion-nonfree-release</id>
+    <pkgname>rpmfusion-nonfree-release</pkgname>
+    <metadata_license>CC0-1.0</metadata_license>
+    <name>RPM Fusion Non-Free</name>
+    <summary>RPM Fusion Repository Configuration</summary>
+  </component>
+</components>
diff --git a/SPECS/appstream-data.spec b/SPECS/appstream-data.spec
new file mode 100644
index 0000000..e1c73c5
--- /dev/null
+++ b/SPECS/appstream-data.spec
@@ -0,0 +1,300 @@
+%define gitdate 20210805
+%global enable_epel 0
+
+Summary:   Cached AppStream metadata
+Name:      appstream-data
+Epoch:     1
+Version:   9
+Release:   %{gitdate}%{?dist}.1
+BuildArch: noarch
+License:   CC0 and CC-BY and CC-BY-SA and GFDL
+URL:       http://people.redhat.com/rhughes/metadata/
+Source1:   http://people.redhat.com/rhughes/metadata/rhel-%{version}-%{gitdate}.xml.gz
+Source2:   http://people.redhat.com/rhughes/metadata/rhel-%{version}-%{gitdate}-icons.tar.gz
+Source3:   https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/adobe-flash.xml
+Source4:   https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/gstreamer-non-free.xml
+Source5:   https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/other-repos.xml
+Source6:   https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/fedora-categories.xml
+Source7:   https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/fedora-popular.xml
+
+# extra applications not in RHEL
+%if 0%{?enable_epel}
+Source9:   http://people.redhat.com/rhughes/metadata/epel-%{version}-%{gitdate}.xml.gz
+Source10:  http://people.redhat.com/rhughes/metadata/epel-%{version}-%{gitdate}-icons.tar.gz
+%endif
+
+# This is built using:
+# ARCHIVE_PATH=/run/media/hughsie/Backup/mirror
+# dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-9-baseos -p ${ARCHIVE_PATH}/RHEL/ &> rhel-9-baseos.log
+# dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-9-appstream -p ${ARCHIVE_PATH}/RHEL/ &> rhel-9-appstream.log
+# dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-9-crb -p ${ARCHIVE_PATH}/RHEL/ &> rhel-9-crb.log
+# https://github.com/hughsie/appstream-scripts/blob/master/rhel/rhel-9-candidate.sh
+
+BuildRequires: libappstream-glib
+
+%description
+This package provides the distribution specific AppStream metadata required
+for the GNOME and KDE software centers.
+
+%install
+
+DESTDIR=%{buildroot} appstream-util install-origin rhel-%{version} %{SOURCE1} %{SOURCE2}
+%if 0%{?enable_epel}
+DESTDIR=%{buildroot} appstream-util install-origin epel-%{version} %{SOURCE9} %{SOURCE10}
+%endif
+DESTDIR=%{buildroot} appstream-util install \
+	%{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}
+
+%files
+%attr(0644,root,root) %{_datadir}/app-info/xmls/*
+%{_datadir}/app-info/icons/rhel-%{version}/*/*.png
+%if 0%{?enable_epel}
+%{_datadir}/app-info/icons/epel-%{version}/*/*.png
+%endif
+%dir %{_datadir}/app-info
+%dir %{_datadir}/app-info/icons
+%dir %{_datadir}/app-info/icons/rhel-%{version}/64x64
+%dir %{_datadir}/app-info/icons/rhel-%{version}/128x128
+%if 0%{?enable_epel}
+%dir %{_datadir}/app-info/icons/epel-%{version}/64x64
+%dir %{_datadir}/app-info/icons/epel-%{version}/128x128
+%endif
+%dir %{_datadir}/app-info/xmls
+
+%changelog
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:9-20210805.1
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Thu Aug 05 2021 Richard Hughes <richard@hughsie.com> 1:9-20210805
+- New metadata version
+- Resolves: rhbz#1926838
+
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 34-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Mar 31 2021 Richard Hughes <richard@hughsie.com> 34-1
+- New metadata version
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 33-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Oct 15 2020 Richard Hughes <richard@hughsie.com> 33-1
+- New metadata version
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 32-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Apr 13 2020 Richard Hughes <richard@hughsie.com> 32-6
+- New metadata version
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 32-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jan 02 2020 Kalev Lember <klember@redhat.com> - 32-4
+- New metadata version
+
+* Mon Oct 14 2019 Kalev Lember <klember@redhat.com> - 32-3
+- New metadata version
+
+* Thu Sep 19 2019 Kalev Lember <klember@redhat.com> - 32-2
+- Update webapps.xml
+
+* Thu Sep 19 2019 Kalev Lember <klember@redhat.com> - 32-1
+- New metadata version
+
+* Wed Sep 18 2019 Kalev Lember <klember@redhat.com> - 31-4
+- Update categories and popular xmls with renamed app ids
+
+* Wed Sep 18 2019 Kalev Lember <klember@redhat.com> - 31-3
+- New metadata version
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 31-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Jul 12 2019 Richard Hughes <richard@hughsie.com> 31-1
+- New metadata version
+
+* Thu Apr 18 2019 Kalev Lember <klember@redhat.com> - 30-5
+- New metadata version
+
+* Thu Apr 11 2019 Kalev Lember <klember@redhat.com> - 30-4
+- New metadata version
+- Update changed app IDs in categories and popular xml files
+
+* Mon Apr 01 2019 Kalev Lember <klember@redhat.com> - 30-3
+- New metadata version
+- Update fedora-categories.xml and fedora-popular.xml with changed app IDs
+- Remove steam-oars.xml now that gnome-software no longer ships the steam plugin
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 30-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jan 21 2019 Kalev Lember <klember@redhat.com> - 30-1
+- New metadata version
+
+* Thu Dec 13 2018 Kalev Lember <klember@redhat.com> - 29-8
+- New metadata version
+
+* Wed Oct 10 2018 Kalev Lember <klember@redhat.com> - 29-7
+- New metadata version
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 29-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri May 25 2018 Kalev Lember <klember@redhat.com> - 29-5
+- New metadata version
+
+* Thu Apr 19 2018 Kalev Lember <klember@redhat.com> - 29-4
+- New metadata version
+
+* Wed Apr 04 2018 Kalev Lember <klember@redhat.com> - 29-3
+- New metadata version
+
+* Tue Mar 27 2018 Kalev Lember <klember@redhat.com> - 29-2
+- New metadata version
+
+* Fri Mar 02 2018 Kalev Lember <klember@redhat.com> - 29-1
+- New metadata version
+
+* Thu Feb 15 2018 Kalev Lember <klember@redhat.com> - 28-4
+- New metadata version
+- Sync other-repos.xml and webapps.xml with fedora-appstream
+- Add google-chrome.xml with Google Chrome metadata
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 28-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Dec 28 2017 Kalev Lember <klember@redhat.com> - 28-2
+- New metadata version
+
+* Tue Dec 12 2017 Kalev Lember <klember@redhat.com> - 28-1
+- New metadata version
+
+* Wed Nov 29 2017 Kalev Lember <klember@redhat.com> - 27-7
+- New metadata version
+
+* Mon Oct 16 2017 Kalev Lember <klember@redhat.com> - 27-6
+- New metadata version
+
+* Thu Aug 31 2017 Kalev Lember <klember@redhat.com> - 27-5
+- New metadata version
+
+* Thu Aug 03 2017 Kalev Lember <klember@redhat.com> - 27-4
+- New metadata version
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 27-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Jul 21 2017 Kalev Lember <klember@redhat.com> 27-2
+- New metadata version
+
+* Wed Jun 14 2017 Kalev Lember <klember@redhat.com> 27-1
+- New metadata version
+
+* Tue Apr 11 2017 Kalev Lember <klember@redhat.com> 26-11
+- New metadata version
+
+* Mon Mar 06 2017 Kalev Lember <klember@redhat.com> 26-10
+- New metadata version
+
+* Tue Feb 07 2017 Kalev Lember <klember@redhat.com> 26-9
+- New metadata version
+
+* Mon Jan 23 2017 Kalev Lember <klember@redhat.com> 26-8
+- New metadata version
+
+* Mon Jan 09 2017 Kalev Lember <klember@redhat.com> 26-7
+- New metadata version
+
+* Fri Dec 30 2016 Kalev Lember <klember@redhat.com> 26-6
+- New metadata version
+
+* Tue Dec 20 2016 Kalev Lember <klember@redhat.com> 26-5
+- New metadata version
+
+* Fri Dec 02 2016 Kalev Lember <klember@redhat.com> 26-4
+- New metadata version
+
+* Fri Oct 14 2016 Richard Hughes <richard@hughsie.com> 26-3
+- New metadata version
+
+* Mon Sep 19 2016 Richard Hughes <richard@hughsie.com> 26-2
+- New metadata version
+- Add Steam OARS overrides
+
+* Tue Aug 09 2016 Richard Hughes <richard@hughsie.com> 26-1
+- New metadata version
+
+* Sun Jun 12 2016 Richard Hughes <richard@hughsie.com> 25-4
+- New metadata version
+
+* Thu May 26 2016 Richard Hughes <richard@hughsie.com> 25-3
+- Add the Fedora-specific popular metadata
+
+* Thu May 26 2016 Kalev Lember <klember@redhat.com> 25-2
+- New metadata version
+- Add a test for gstreamer1-plugin-openh264
+
+* Wed Apr 27 2016 Richard Hughes <richard@hughsie.com> 25-1
+- New metadata version
+
+* Mon Feb 15 2016 Richard Hughes <richard@hughsie.com> 24-4
+- New metadata version
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 24-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Dec 16 2015 Richard Hughes <richard@hughsie.com> 24-2
+- New metadata version
+
+* Wed Aug 19 2015 Richard Hughes <richard@hughsie.com> 24-1
+- New metadata version
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 23-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue May 26 2015 Richard Hughes <richard@hughsie.com> 23-2
+- New metadata version
+- Fix the installed icon location for the new origin value
+
+* Mon May 11 2015 Richard Hughes <richard@hughsie.com> 23-1
+- New metadata version
+- Debundle the appstream-extra files
+
+* Thu Apr 23 2015 Richard Hughes <richard@hughsie.com> 22-7
+- New metadata version.
+
+* Fri Mar 20 2015 Kalev Lember <kalevlember@gmail.com> 22-6
+- New metadata version.
+
+* Wed Mar 04 2015 Richard Hughes <richard@hughsie.com> 22-5
+- New metadata version, this time with all the icons.
+
+* Tue Feb 24 2015 Richard Hughes <richard@hughsie.com> 22-4
+- New metadata version.
+
+* Mon Sep 29 2014 Richard Hughes <richard@hughsie.com> 22-3
+- Ship HiDPI icons, harder
+
+* Mon Sep 29 2014 Richard Hughes <richard@hughsie.com> 22-2
+- Ship HiDPI icons
+
+* Thu Jul 17 2014 Richard Hughes <richard@hughsie.com> 22-1
+- New metadata version number, data unchanged.
+
+* Wed Jul 02 2014 Richard Hughes <richard@hughsie.com> 21-5
+- New metadata version with source screenshots.
+
+* Mon Jun 30 2014 Richard Hughes <richard@hughsie.com> 21-4
+- New metadata version that passes xmllint.
+
+* Thu Jun 19 2014 Richard Hughes <richard@hughsie.com> 21-3
+- New metadata version.
+
+* Wed Jun 11 2014 Richard Hughes <richard@hughsie.com> 21-2
+- Own the correct directories
+- Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1107802#c5
+
+* Tue Jun 10 2014 Richard Hughes <richard@hughsie.com> 21-1
+- Initial version for Fedora package review