diff --git a/widelands.changes b/widelands.changes
index 4a849a5..c109e9d 100644
--- a/widelands.changes
+++ b/widelands.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Jul 15 08:49:27 UTC 2017 - mailaender@opensuse.org
+
+- Install man page
+- Install appdata file (lp#1271595)
+- Use upstream supplied .desktop entry
+- Add post macros for icons and desktop files
+- Don't own standard icon directories
+
 -------------------------------------------------------------------
 Sat Jul  8 20:35:26 UTC 2017 - jengelh@inai.de
 
diff --git a/widelands.desktop b/widelands.desktop
deleted file mode 100644
index cae276f..0000000
--- a/widelands.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Widelands
-GenericName=Realtime Strategy Game
-Comment=Build a growing settlement and rule the world
-Icon=widelands
-Exec=widelands
-Categories=Game;StrategyGame;
diff --git a/widelands.spec b/widelands.spec
index bc8ee60..3c4fd68 100644
--- a/widelands.spec
+++ b/widelands.spec
@@ -24,7 +24,6 @@ License:        GPL-2.0+
 Group:          Amusements/Games/Strategy/Other
 Url:            http://www.widelands.org
 Source:         https://launchpad.net/%{name}/%{version}/%{version}/+download/%{name}-%{version}-src.tar.bz2
-Source1:        %{name}.desktop
 BuildRequires:  SDL2_gfx-devel
 BuildRequires:  SDL2_image-devel
 BuildRequires:  SDL2_mixer-devel
@@ -37,6 +36,7 @@ BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  gettext
 BuildRequires:  glew-devel
+BuildRequires:  hicolor-icon-theme
 BuildRequires:  libicu-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel
@@ -106,36 +106,45 @@ sed -i 's/\(install(TARGETS ${NAME} DESTINATION \)"."\( COMPONENT ExecutableFile
 
 %install
 %cmake_install
+
 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 %{SOURCE1} %{buildroot}%{_datadir}/applications/%{name}.desktop
-%suse_update_desktop_file %{name}
+
+install -D -m 0644 debian/widelands.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/widelands.appdata.xml %{buildroot}%{_datadir}/appdata/widelands.appdata.xml
+
 %fdupes %{buildroot}%{_datadir}
+
 %find_lang %{name} --all-name
+
 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'
 
+%post
+%desktop_database_post
+%icon_theme_cache_post
+
+%postun
+%desktop_database_postun
+%icon_theme_cache_postun
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING CREDITS ChangeLog
 %{_bindir}/%{name}
-%dir %{_datadir}/icons/hicolor
-%dir %{_datadir}/icons/hicolor/128x128
-%dir %{_datadir}/icons/hicolor/128x128/apps
-%dir %{_datadir}/icons/hicolor/16x16
-%dir %{_datadir}/icons/hicolor/16x16/apps
-%dir %{_datadir}/icons/hicolor/32x32
-%dir %{_datadir}/icons/hicolor/32x32/apps
-%dir %{_datadir}/icons/hicolor/48x48
-%dir %{_datadir}/icons/hicolor/48x48/apps
-%dir %{_datadir}/icons/hicolor/64x64
-%dir %{_datadir}/icons/hicolor/64x64/apps
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_datadir}/applications/%{name}.desktop
+%{_mandir}/man6/widelands.*
+%{_datadir}/appdata/widelands.appdata.xml
 
 %files data -f %{name}.lang
 %defattr(-,root,root,-)