diff --git a/widelands.spec b/widelands.spec
index 9df73f0..e0b9428 100644
--- a/widelands.spec
+++ b/widelands.spec
@@ -111,13 +111,13 @@ for i in 16 32 48 64 128; do
   install -D -m 0644 data/images/logos/wl-ico-${i}.png %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
 done
 
-install -D -m 0644 debian/org.widelands.widelands.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop
+install -D -m 0644 debian/org.%{name}.%{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop
 %suse_update_desktop_file %{name} -r Game StrategyGame
 desktop-file-edit --set-icon=%{name} %{buildroot}%{_datadir}/applications/%{name}.desktop
 
-install -D -m 0644 debian/widelands.6 %{buildroot}%{_mandir}/man6/widelands.6
+install -D -m 0644 debian/%{name}.6 %{buildroot}%{_mandir}/man6/%{name}.6
 
-install -D -m 0644 debian/widelands.appdata.xml %{buildroot}%{_datadir}/appdata/widelands.appdata.xml
+install -D -m 0644 debian/%{name}.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
 
 %fdupes %{buildroot}%{_datadir}
 
@@ -127,7 +127,7 @@ rm -f %{buildroot}%{_prefix}/{COPYING,CREDITS,ChangeLog,VERSION}
 
 # No need to execute tests as they are already executed implicitly on install
 # instead do post-install test
-PATH=%{buildroot}%{_bindir}:$PATH widelands --help | grep 'This is Widelands'
+PATH=%{buildroot}%{_bindir}:$PATH %{name} --help | grep 'This is Widelands'
 
 %if 0%{?suse_version} < 1330
 %post
@@ -145,8 +145,8 @@ PATH=%{buildroot}%{_bindir}:$PATH widelands --help | grep 'This is Widelands'
 %{_bindir}/%{name}
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_datadir}/applications/%{name}.desktop
-%{_mandir}/man6/widelands.*
-%{_datadir}/appdata/widelands.appdata.xml
+%{_mandir}/man6/%{name}.*
+%{_datadir}/appdata/%{name}.appdata.xml
 
 %files data -f %{name}.lang
 %dir %{_datadir}/%{name}