diff --git a/appstream-data.spec b/appstream-data.spec
index 969941d..8c3f661 100644
--- a/appstream-data.spec
+++ b/appstream-data.spec
@@ -1,11 +1,10 @@
 Summary:   Fedora AppStream metadata
 Name:      appstream-data
 Version:   30
-Release:   5%{?dist}
+Release:   11%{?dist}
 BuildArch: noarch
 License:   CC0 and CC-BY and CC-BY-SA and GFDL
 URL:       https://github.com/hughsie/appstream-glib
-# Logs available in https://github.com/hughsie/createrepo_as_logs/commits/master
 Source1:   https://dl.fedoraproject.org/pub/alt/screenshots/f%{version}/fedora-%{version}.xml.gz
 Source2:   https://dl.fedoraproject.org/pub/alt/screenshots/f%{version}/fedora-%{version}-icons.tar.gz
 Source3:   https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/adobe-flash.xml
@@ -47,6 +46,27 @@ fi
 %dir %{_datadir}/app-info/xmls
 
 %changelog
+* Thu Jan 02 2020 Kalev Lember <klember@redhat.com> - 30-11
+- New metadata version
+
+* Mon Oct 14 2019 Kalev Lember <klember@redhat.com> - 30-10
+- New metadata version
+
+* Thu Sep 19 2019 Kalev Lember <klember@redhat.com> - 30-9
+- New metadata version
+
+* Wed Sep 18 2019 Kalev Lember <klember@redhat.com> - 30-8
+- New metadata version
+- Update categories xml with renamed app ids
+
+* Fri Jul 12 2019 Richard Hughes <richard@hughsie.com> 30-7
+- New metadata version
+
+* Tue May 14 2019 Kalev Lember <klember@redhat.com> - 30-6
+- New metadata version
+- Remove Google Plus web app
+- Update categories and popular xml files with changed app IDs
+
 * Thu Apr 18 2019 Kalev Lember <klember@redhat.com> - 30-5
 - New metadata version
 
diff --git a/fedora-categories.xml b/fedora-categories.xml
index 4d66378..ef4cb83 100644
--- a/fedora-categories.xml
+++ b/fedora-categories.xml
@@ -73,7 +73,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>org.gnome.Music</id>
+    <id>org.gnome.Music.desktop</id>
     <categories>
       <category>AudioVideo</category>
       <category>Featured</category>
@@ -129,7 +129,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>gitg.desktop</id>
+    <id>org.gnome.gitg</id>
     <categories>
       <category>Development</category>
       <category>Featured</category>
@@ -311,7 +311,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>blender.desktop</id>
+    <id>org.blender.Blender</id>
     <categories>
       <category>Graphics</category>
       <category>Featured</category>
@@ -402,7 +402,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>org.gnome.Geary</id>
+    <id>org.gnome.Geary.desktop</id>
     <categories>
       <category>Network</category>
       <category>Featured</category>
@@ -465,7 +465,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>org.gnome.Geary</id>
+    <id>org.gnome.Geary.desktop</id>
     <categories>
       <category>Office</category>
       <category>Featured</category>
@@ -486,7 +486,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>gramps.desktop</id>
+    <id>org.gramps.gramps</id>
     <categories>
       <category>Office</category>
       <category>Featured</category>
@@ -549,7 +549,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>org.gnome.Boxes</id>
+    <id>org.gnome.Boxes.desktop</id>
     <categories>
       <category>Utility</category>
       <category>Featured</category>
diff --git a/fedora-popular.xml b/fedora-popular.xml
index 9cd9f6a..f8a0105 100644
--- a/fedora-popular.xml
+++ b/fedora-popular.xml
@@ -39,7 +39,7 @@
     </kudos>
   </component>
   <component type="desktop">
-    <id>org.gnome.Geary</id>
+    <id>org.gnome.Geary.desktop</id>
     <kudos>
       <kudo>GnomeSoftware::popular</kudo>
     </kudos>
diff --git a/sources b/sources
index 397fd7a..48853d8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (fedora-30.xml.gz) = d368480a08a5fc20363de4b2863dc2c27672771c1392309a154a68cb12d9bd11c80ef0f61e31c88a5dc731dbc6cee2f5a7471f16766fffb6aa6ba7fa9165d968
-SHA512 (fedora-30-icons.tar.gz) = 284b0350cd3983636693be23b9e808cc255589acee68441276c5127e9c5f5455914a967e9975a6177cdfc92768534525eb9f184a876ee3d90fe3826dffaf123b
+SHA512 (fedora-30.xml.gz) = c63aa1738923feec15b844ab9143cb0bb63f14fdd2e2d199b8eaff13aeaadb5078ab1d6a2faacbae9ca1e60695e011609812fe3bc3772658d56ebf98f023a7ae
+SHA512 (fedora-30-icons.tar.gz) = 335d028a94b2d62b170cf8118625dcc69a49aba4084c0c1a97d1db99939a1baaa45d61a13d9aad2c3c156454b3e6766693f92c39d7aee9e3f53387bb2e81aa5c
diff --git a/webapps.xml b/webapps.xml
index 8374d6b..197d05f 100644
--- a/webapps.xml
+++ b/webapps.xml
@@ -250,38 +250,6 @@
       <value key="X-Kudo-Popular"/>
     </metadata>
   </component>
-  <component type="webapp">
-    <id>epiphany-googleplus.desktop</id>
-    <metadata_license>CC0-1.0</metadata_license>
-    <project_license>proprietary</project_license>
-    <name>Google Plus</name>
-    <summary>Share and discover</summary>
-    <description>
-      <p>
-        Google+ is one of the most active social media networks with hundreds of
-        millions of people having active accounts.
-        Whether it's a simple note or a special photograph, share life's
-        important moments with just the right people.
-        You can even make a video call with up to 10 friends at once.
-      </p>
-      <p>
-        To use Google+ you need a Google account and be over the age of 13.
-      </p>
-    </description>
-    <icon type="remote">https://developers.google.com/+/images/branding/g+128.png</icon>
-    <categories>
-      <category>InstantMessaging</category>
-      <category>Network</category>
-    </categories>
-    <keywords>
-      <keyword>google</keyword>
-      <keyword>plus</keyword>
-    </keywords>
-    <url type="homepage">http://plus.google.com/</url>
-    <metadata>
-      <value key="X-Kudo-Popular"/>
-    </metadata>
-  </component>
   <component type="addon">
     <id>libnpgoogletalk.so</id>
     <pkgname>google-talkplugin</pkgname>