diff --git a/appstream-data.spec b/appstream-data.spec
index 7030583..efb2de9 100644
--- a/appstream-data.spec
+++ b/appstream-data.spec
@@ -1,7 +1,7 @@
 Summary:   Fedora AppStream metadata
 Name:      appstream-data
 Version:   25
-Release:   2%{?dist}
+Release:   3%{?dist}
 BuildArch: noarch
 License:   CC0 and CC-BY and CC-BY-SA and GFDL
 URL:       https://github.com/hughsie/createrepo_as
@@ -11,6 +11,8 @@ Source3:   https://raw.githubusercontent.com/hughsie/fedora-appstream/master/app
 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/webapps.xml
+Source7:   https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/fedora-categories.xml
+Source8:   https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/fedora-popular.xml
 
 BuildRequires: libappstream-glib
 
@@ -23,7 +25,7 @@ createrepo_as and the extra data in fedora-appstream.
 
 DESTDIR=%{buildroot} appstream-util install-origin fedora %{SOURCE1} %{SOURCE2}
 DESTDIR=%{buildroot} appstream-util install \
-	%{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6}
+	%{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8}
 
 %check
 if ! gunzip -c %{buildroot}%{_datadir}/app-info/xmls/fedora.xml.gz | grep -q '<pkgname>gstreamer1-plugin-openh264</pkgname>' ; then
@@ -42,6 +44,9 @@ fi
 %dir %{_datadir}/app-info/xmls
 
 %changelog
+* 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
diff --git a/fedora-categories.xml b/fedora-categories.xml
new file mode 100644
index 0000000..78b6658
--- /dev/null
+++ b/fedora-categories.xml
@@ -0,0 +1,528 @@
+<?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>amarok.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>ardour4.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>audacity.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>banshee.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>brasero.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>easytag.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>gnome-music.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>rhythmbox.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>rosegarden.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>sound-juicer.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>anjuta.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>devassistant.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>devhelp.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>d-feet.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>eclipse.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>gitg.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>glade.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>monodevelop.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.gedit.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>celestia.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>0ad.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>btanks.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>frozen-bubble.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>gnome-chess.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>gnome-mahjongg.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>gnome-mines.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>gnome-sudoku.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>gnome-tetravex.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>iagno.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>lightsoff.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>neverball.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>openarena.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>quadrapassel.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>redeclipse.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>sol.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>supertuxkart.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>swell-foop.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>tremulous.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>wesnoth.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>xonotic.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>blender.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>darktable.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>gimp.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>inkscape.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>libreoffice-draw.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>mypaint.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.font-viewer.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>scribus.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>shotwell.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>simple-scan.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>chromium-browser.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>epiphany.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>firefox.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>geary.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>mozilla-thunderbird.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Polari.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>pidgin.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>transmission-gtk.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>vinagre.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>abiword.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>evolution.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>geary.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>gnucash.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>gnumeric.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>gramps.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>libreoffice-calc.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>libreoffice-impress.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>libreoffice-writer.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>lyx.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>octave.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>saoimage.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>stellarium.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>gnome-disks.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>gparted.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Boxes.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>virt-manager.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>bijiben.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.clocks.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Documents.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Photos.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>workrave.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>openshot.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Cheese.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Totem.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>pitivi.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>vlc.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Builder.desktop</id>
+    <categories>
+      <category>featured</category>
+    </categories>
+  </component>
+
+</components>
diff --git a/fedora-popular.xml b/fedora-popular.xml
new file mode 100644
index 0000000..4bcf139
--- /dev/null
+++ b/fedora-popular.xml
@@ -0,0 +1,95 @@
+<?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>bijiben.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>geary.desktop</id>
+    <kudos>
+      <kudo>GnomeSoftware::popular</kudo>
+    </kudos>
+  </component>
+  <component type="desktop">
+    <id>gnucash.desktop</id>
+    <kudos>
+      <kudo>GnomeSoftware::popular</kudo>
+    </kudos>
+  </component>
+  <component type="desktop">
+    <id>gtg.desktop</id>
+    <kudos>
+      <kudo>GnomeSoftware::popular</kudo>
+    </kudos>
+  </component>
+  <component type="desktop">
+    <id>inkscape.desktop</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>musique.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>stellarium.desktop</id>
+    <kudos>
+      <kudo>GnomeSoftware::popular</kudo>
+    </kudos>
+  </component>
+  <component type="desktop">
+    <id>transmission-gtk.desktop</id>
+    <kudos>
+      <kudo>GnomeSoftware::popular</kudo>
+    </kudos>
+  </component>
+</components>