diff --git a/keepassxc.spec b/keepassxc.spec
index e86af55..253cfe9 100644
--- a/keepassxc.spec
+++ b/keepassxc.spec
@@ -40,7 +40,7 @@ information can be considered as quite safe.
 
 
 %prep
-%setup -n %{name}-%{version}
+%autosetup
 
 # get rid of icon tag in appdata file
 # icon tag is not allowed in desktop appdata file
@@ -89,7 +89,7 @@ install -D -m 644 -p x-keepassxc.desktop \
 
 %check
 ctest -V %{?_smp_mflags}
-desktop-file-validate %{buildroot}%{_datadir}/applications/keepassxc.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/org.%{name}.KeePassXC.desktop
 appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{name}.KeePassXC.appdata.xml
 
 %files