diff --git a/.appstream-data.metadata b/.appstream-data.metadata
index d654c20..a2d52fe 100644
--- a/.appstream-data.metadata
+++ b/.appstream-data.metadata
@@ -1,6 +1,6 @@
-9364f525bedf030f94a2feb74b04aed4ec4ee65f SOURCES/epel-7-20170301-icons.tar.gz
-d1221736d0b82ce2a287e31617419a1a4c4b6b34 SOURCES/epel-7-20170301.xml.gz
+946fcb908c5ae82bf45055bec59835d9861c3531 SOURCES/epel-7-20180614-icons.tar.gz
+e5df7ad5a44dd84da24600b496e6268d9e37d08d SOURCES/epel-7-20180614.xml.gz
 59c507ca5e5884ad502ab151a927349dbfd5b3dc SOURCES/fonts-icons.tar.gz
 008d965daad9583f1083999b7e10388059edabcc SOURCES/fonts.xml.gz
-896d5fe0a38bc59ec64938bb745c41e2d238ee55 SOURCES/rhel-7-20170301-icons.tar.gz
-1e07a78f0b1527ff49228da5b0789c956a758ed3 SOURCES/rhel-7-20170301.xml.gz
+2e8a9b74ab8b39a9c6c4ece38de1e5764c6909fe SOURCES/rhel-7-20180614-icons.tar.gz
+47f1db81a3f700194708237247b2b27061cecdfd SOURCES/rhel-7-20180614.xml.gz
diff --git a/.gitignore b/.gitignore
index 0711d98..0c14611 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-SOURCES/epel-7-20170301-icons.tar.gz
-SOURCES/epel-7-20170301.xml.gz
+SOURCES/epel-7-20180614-icons.tar.gz
+SOURCES/epel-7-20180614.xml.gz
 SOURCES/fonts-icons.tar.gz
 SOURCES/fonts.xml.gz
-SOURCES/rhel-7-20170301-icons.tar.gz
-SOURCES/rhel-7-20170301.xml.gz
+SOURCES/rhel-7-20180614-icons.tar.gz
+SOURCES/rhel-7-20180614.xml.gz
diff --git a/SPECS/appstream-data.spec b/SPECS/appstream-data.spec
index d99ed99..051de6b 100644
--- a/SPECS/appstream-data.spec
+++ b/SPECS/appstream-data.spec
@@ -1,4 +1,4 @@
-%define gitdate 20170301
+%define gitdate 20180614
 
 Summary:   Cached AppStream metadata
 Name:      appstream-data
@@ -23,9 +23,15 @@ Source9:   http://people.redhat.com/rhughes/metadata/epel-%{version}-%{gitdate}.
 Source10:  http://people.redhat.com/rhughes/metadata/epel-%{version}-%{gitdate}-icons.tar.gz
 
 # This is built using:
-# sshfs user@host:/media/bulk/mirror/RHEL /media/mirror/
-# reposync -r rhel-7.4-candidate -p /media/mirror/
-# https://github.com/hughsie/appstream-scripts/blob/master/rhel/rhel-7.4-candidate.sh
+# sshfs user@host:/media/bulk/mirror/RHEL mnt
+# reposync --repo rhel-7.6 -p mnt/rhel-7.6-candidate/
+# https://github.com/hughsie/appstream-scripts/blob/master/rhel/rhel-7.6-candidate.sh
+#
+# [rhel-7.6]
+# name=Nightly Packages for Enterprise Linux 7 - $basearch
+# baseurl=http://download.eng.brq.redhat.com/composes/nightly/latest-RHEL-7.6/compose/Client/x86_64/os/
+# enabled=0
+# gpgcheck=0
 #
 # For a long time (but not long enough to be older than the original release of
 # RHEL 7) we require applications to ship with AppData files if they want to
@@ -53,19 +59,12 @@ for the GNOME and KDE software centers.
 
 %install
 
-# we can't use `install-origin` as appstream-glib in RHEL is too old, and the
-# tarball name has to match the origin :/
-cp %{SOURCE1} rhel-%{version}.xml.gz
-cp %{SOURCE2} rhel-%{version}-icons.tar.gz
-cp %{SOURCE9} epel-%{version}.xml.gz
-cp %{SOURCE10} epel-%{version}-icons.tar.gz
-
-DESTDIR=%{buildroot} appstream-util install rhel-%{version}.xml.gz rhel-%{version}-icons.tar.gz
-DESTDIR=%{buildroot} appstream-util install epel-%{version}.xml.gz epel-%{version}-icons.tar.gz
+DESTDIR=%{buildroot} appstream-util install-origin rhel-7 %{SOURCE1} %{SOURCE2}
+DESTDIR=%{buildroot} appstream-util install-origin epel-7 %{SOURCE9} %{SOURCE10}
 DESTDIR=%{buildroot} appstream-util install \
 	%{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8}
 
-# work around the not-yet-in-rhel install-origin
+# work around the font origin issue
 mv %{buildroot}/usr/share/app-info/icons/fonts/64x64/* %{buildroot}/usr/share/app-info/icons/rhel-%{version}/64x64/
 rmdir %{buildroot}/usr/share/app-info/icons/fonts/64x64
 rmdir %{buildroot}/usr/share/app-info/icons/fonts
@@ -83,6 +82,10 @@ rmdir %{buildroot}/usr/share/app-info/icons/fonts
 %dir %{_datadir}/app-info/xmls
 
 %changelog
+* Thu Jun 14 2018 Richard Hughes <richard@hughsie.com> 7-20180614
+- Regenerate the RHEL metadata using rhel-7.6-candidate
+- Resolves: RHBZ#1570031
+
 * Wed Mar 01 2017 Richard Hughes <richard@hughsie.com> 7-20170301
 - Rename the generated metadata files to placate RPMDiff.
 - Resolves: RHBZ#1386778