diff --git a/avahi.spec b/avahi.spec
index 4a3c7f6..f2bd0d0 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -22,7 +22,7 @@
 
 Name:             avahi
 Version:          0.7
-Release:          6%{?dist}
+Release:          7%{?dist}
 Summary:          Local network service discovery
 License:          LGPLv2+
 URL:              http://avahi.org
@@ -39,6 +39,7 @@ BuildRequires:    libtool
 BuildRequires:    dbus-devel >= 0.90
 BuildRequires:    dbus-glib-devel >= 0.70
 BuildRequires:    dbus-python
+BuildRequires:    desktop-file-utils
 BuildRequires:    libxml2-python
 BuildRequires:    gtk2-devel
 BuildRequires:    gtk3-devel >= 2.99.0
@@ -423,9 +424,22 @@ sed -i 's!/usr/bin/python!/usr/bin/python3!' %{buildroot}%{python3_sitelib}/avah
 rm -fv %{buildroot}%{_sysconfdir}/rc.d/init.d/avahi-daemon
 rm -fv %{buildroot}%{_sysconfdir}/rc.d/init.d/avahi-dnsconfd
 
+# avoid empty GenericName keys from .desktop files
+for i in %{buildroot}%{_datadir}/applications/*.desktop ; do
+if [ -n "$(grep '^GenericName=$' $i)" ]; then
+  desktop-file-edit --copy-name-to-generic-name $i
+fi
+done
+
 %find_lang %{name}
 
 
+%check
+for i in %{buildroot}%{_datadir}/applications/*.desktop ; do
+desktop-file-validate $i
+done
+
+
 %pre
 getent group avahi >/dev/null || groupadd -f -g 70 -r avahi
 if ! getent passwd avahi > /dev/null ; then
@@ -676,6 +690,9 @@ exit 0
 
 
 %changelog
+* Mon Dec 11 2017 Rex Dieter <rdieter@fedoraproject.org> - 0.7-7
+- %%check: validate .desktop files (#1524175)
+
 * Tue Oct 24 2017 Merlin Mathesius <mmathesi@redhat.com> - 0.7-6
 - Add option to disable qt4 support