diff --git a/kmail.spec b/kmail.spec
index adee9e1..22ea715 100644
--- a/kmail.spec
+++ b/kmail.spec
@@ -139,9 +139,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %find_lang %{name} --all-name --with-html
 
-# hack to make kmail -> help -> Kmail Handbook work (verify if still needed)
-#ln -s kmail %{buildroot}%{_kf5_docdir}/HTML/en/kmail2
-
 ## unpackaged files
 rm -rfv %{buildroot}%{_kf5_datadir}/icons/locolor
 
@@ -150,7 +147,9 @@ rm -rfv %{buildroot}%{_kf5_datadir}/icons/locolor
 for f in %{buildroot}%{_kf5_datadir}/applications/*.desktop ; do
   desktop-file-validate $f
 done
-appstream-util validate-relax --nonet %{buildroot}%{_kf5_datadir}/appdata/org.kde.%{name}.appdata.xml
+for f in %{buildroot}%{_kf5_datadir}/appdata/*.appdata.xml ; do
+appstream-util validate-relax --nonet $f
+done
 %if 0%{?tests}
 export CTEST_OUTPUT_ON_FAILURE=1
 xvfb-run -a \
@@ -185,8 +184,8 @@ fi
 %license COPYING*
 %{_kf5_sysconfdir}/xdg/kmail.*
 %{_kf5_bindir}/kmail
-%{_kf5_datadir}/appdata/org.kde.kmail.appdata.xml
-%{_kf5_datadir}/applications/org.kde.kmail.desktop
+%{_kf5_datadir}/appdata/org.kde.kmail2.appdata.xml
+%{_kf5_datadir}/applications/org.kde.kmail2.desktop
 %{_kf5_datadir}/config.kcfg/kmail.kcfg
 %{_kf5_datadir}/kmail2/
 %{_kf5_datadir}/kservices5/kmail_*.desktop
@@ -197,8 +196,6 @@ fi
 %{_kf5_datadir}/icons/hicolor/*/*/*
 %{_kf5_datadir}/kconf_update/kmail.upd
 %{_kf5_datadir}/applications/kmail_view.desktop
-#{_kf5_docdir}/HTML/en/kmail/
-#{_kf5_docdir}/HTML/en/kmail2
 %{_kf5_datadir}/knotifications5/kmail2.notifyrc
 %{_kf5_datadir}/kxmlgui5/kmail2/
 %{_kf5_datadir}/kconf_update/kmail-*
@@ -218,18 +215,14 @@ fi
 %{_kf5_datadir}/knotifications5/akonadi_followupreminder_agent.notifyrc
 %{_kf5_datadir}/knotifications5/akonadi_mailfilter_agent.notifyrc
 %{_kf5_datadir}/knotifications5/akonadi_sendlater_agent.notifyrc
-#{_kf5_docdir}/HTML/en/akonadi_archivemail_agent/
-#{_kf5_docdir}/HTML/en/akonadi_followupreminder_agent/
-#{_kf5_docdir}/HTML/en/akonadi_sendlater_agent/
 # ktnef
 %{_kf5_sysconfdir}/xdg/ktnef.categories
 %{_kf5_bindir}/ktnef
 %{_kf5_datadir}/applications/org.kde.ktnef.desktop
-#{_kf5_docdir}/HTML/en/ktnef/
-%{_kf5_datadir}/icons/*/*/actions/ktnef_extract_all_to.png
-%{_kf5_datadir}/icons/*/*/actions/ktnef_extract_to.png
-%{_kf5_datadir}/icons/*/*/apps/ktnef.png
-
+## covered by hicolor glob above -- rex
+#{_kf5_datadir}/icons/*/*/actions/ktnef_extract_all_to.png
+#{_kf5_datadir}/icons/*/*/actions/ktnef_extract_to.png
+#{_kf5_datadir}/icons/*/*/apps/ktnef.png
 
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig