diff --git a/f31-backgrounds.spec b/f31-backgrounds.spec
index 9f089b4..d6b916e 100644
--- a/f31-backgrounds.spec
+++ b/f31-backgrounds.spec
@@ -10,14 +10,12 @@
 
 Name:		%{bgname}-backgrounds
 Version:	%{relnum}.0.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Fedora %{relnum} default desktop background
 
 License:	CC-BY-SA
 URL:		https://fedoraproject.org/wiki/F%{relnum}_Artwork
 Source0:	https://github.com/fedoradesign/backgrounds/releases/download/v%{version}/%{name}-%{version}.tar.xz
-# Plasma desktoptheme
-Source1:	%{bgname}-metadata.desktop
 # 30 -> 31 KDE metadata fix applied upstream but not released yet
 # https://github.com/fedoradesign/backgrounds/commit/0c4838651f15252696b6c89b51761be2e74843e5
 Patch1:		0c4838651f15252696b6c89b51761be2e74843e5.patch
@@ -150,11 +148,20 @@ This package contains F%{relnum} supplemental wallpapers for XFCE
 %install
 %make_install
 
-install -D -p -m644 %{SOURCE1} \
+# FIXME: shouldn't 'upstream' tarball do this? also, upstream *does*
+# install this file to some *other* location, not sure if that's
+# necessary: https://github.com/fedoradesign/backgrounds/issues/16
+install -D -p -m644 default/f31-metadata.desktop \
 %{buildroot}%{_datadir}/plasma/desktoptheme/%{Bg_Name}/metadata.desktop
 
-%check
-desktop-file-validate %{buildroot}%{_datadir}/plasma/desktoptheme/%{Bg_Name}/metadata.desktop
+# note the metadata.desktop file is not desktop-entry-spec compliant
+# and should not have desktop-file-validate run on it. It follows
+# the Plasma theme spec defined at:
+# https://techbase.kde.org/Development/Tutorials/Plasma5/ThemeDetails
+# which requires a non-FDO-compliant .desktop file
+# https://bugs.kde.org/show_bug.cgi?id=411876
+# It is not an application launcher, so not running validation on it
+# does not violate the guidelines.
 
 %files
 %doc
@@ -223,6 +230,10 @@ desktop-file-validate %{buildroot}%{_datadir}/plasma/desktoptheme/%{Bg_Name}/met
 %endif
 
 %changelog
+* Thu Sep 12 2019 Adam Williamson <awilliam@redhat.com> - 31.0.2-4
+- Drop the unnecessary downstream copy of metadata.desktop
+- Install upstream copy to the place we were installing downstream copy
+
 * Wed Sep 11 2019 Adam Williamson <awilliam@redhat.com> - 31.0.2-3
 - Backport a KDE metadata fix that was not yet released
 
diff --git a/f31-metadata.desktop b/f31-metadata.desktop
deleted file mode 100644
index 905e6d9..0000000
--- a/f31-metadata.desktop
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Name=Fedora Thirty-One
-Comment=Fedora Plasma theme
-
-X-KDE-PluginInfo-Author=Fedora KDE-SIG
-X-KDE-PluginInfo-Email=kde@lists.fedoraproject.org
-X-KDE-PluginInfo-Name=F31
-X-KDE-PluginInfo-Version=31.0
-X-KDE-PluginInfo-Website=http://fedoraproject.org/SIGs/KDE
-X-KDE-PluginInfo-Category=
-X-KDE-PluginInfo-Depends=
-X-KDE-PluginInfo-License=CC-BY-SA
-X-KDE-PluginInfo-EnabledByDefault=true
-X-Plasma-API=5.0
-Type=Link
-
-[X-Settings]
-FallbackTheme=default
-
-[X-Wallpaper]
-defaultWallpaperTheme=F31	
-defaultFileSuffix=.png
-defaultWidth=1920
-defaultHeight=1200
-
-[X-Branding]
-homepage=http://fedoraproject.org
-
-[X-ContrastEffect]
-enabled=true
-contrast=0.2
-#intensity is disabled, in order to auto adjust to the chosen theme color
-#intensity=2.0
-saturation=1.7