diff --git a/srcpkgs/widelands-data b/srcpkgs/widelands-data
new file mode 120000
index 00000000000..e9fbf89517f
--- /dev/null
+++ b/srcpkgs/widelands-data
@@ -0,0 +1 @@
+widelands
\ No newline at end of file
diff --git a/srcpkgs/widelands/files/widelands.desktop b/srcpkgs/widelands/files/widelands.desktop
index 397cf41153d..f89b422e25a 100644
--- a/srcpkgs/widelands/files/widelands.desktop
+++ b/srcpkgs/widelands/files/widelands.desktop
@@ -16,7 +16,7 @@ GenericName[ru]=Стратегическая игра
 GenericName[sk]=Strategická hra
 Comment=A a real-time build-up strategy game
 Comment[de]=Echtzeitbasiertes Aufbau-Strategiespiel
-Icon=/usr/share/games/widelands/pics/wl-ico-128.png
-TryExec=/usr/games/widelands
+Icon=/usr/share/widelands/pics/wl-ico-128.png
+TryExec=/usr/share/widelands/widelands
 Exec=/usr/bin/widelands
 Categories=Application;Game;StrategyGame;
diff --git a/srcpkgs/widelands/files/widelands.sh b/srcpkgs/widelands/files/widelands.sh
index 561a48a6dc6..f2b795ea566 100644
--- a/srcpkgs/widelands/files/widelands.sh
+++ b/srcpkgs/widelands/files/widelands.sh
@@ -2,9 +2,9 @@
 #
 # Startup script for widelands to recognize the user's LANG setting, if any.
 
-WL_DATA="/usr/share/games/widelands"
+WL_DATA="/usr/share/widelands"
 WL_LOCALE="$WL_DATA/locale"
 WL_LANG="$LANG"
 [ -z "$WL_LANG" ] && WL_LANG="en_US.UTF-8"
 
-exec /usr/games/widelands --datadir="$WL_DATA" --localedir="$WL_LOCALE" --language="$WL_LANG"
+exec /usr/share/widelands/widelands --datadir="$WL_DATA" --localedir="$WL_LOCALE" --language="$WL_LANG"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index c209c954ece..786aa234010 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,15 +1,18 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=18
-revision=1
+revision=2
 wrksrc=${pkgname}-build${version}-src
 build_style=cmake
 configure_args="
--DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
--DLUA_LIBRARY=${XBPS_CROSS_BASE}/usr/lib/liblua5.1.a
--DLUA_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/lua5.1"
+ -DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
+ -DLUA_LIBRARY=${XBPS_CROSS_BASE}/usr/lib/liblua5.1.a
+ -DLUA_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/lua5.1
+ -DWL_INSTALL_DATADIR=share/widelands
+ -DWL_INSTALL_BINDIR=share/widelands"
 hostmakedepends="cmake python pkg-config"
 makedepends="boost-devel minizip-devel glu-devel glew-devel SDL_gfx-devel SDL_image-devel SDL_net-devel SDL_mixer-devel SDL_ttf-devel lua51-devel"
+depends="${pkgname}-data-${version}_${revision}"
 short_desc="A real-time strategy game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"
@@ -21,3 +24,22 @@ post_install() {
 	vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
 	vbin ${FILESDIR}/${pkgname}.sh ${pkgname}
 }
+
+widelands-data_package() {
+	noarch=yes
+	short_desc+=" - data files"
+	pkg_install() {
+		vmove usr/share/widelands/campaigns
+		vmove usr/share/widelands/fonts
+		vmove usr/share/widelands/global
+		vmove usr/share/widelands/locale
+		vmove usr/share/widelands/maps
+		vmove usr/share/widelands/music
+		vmove usr/share/widelands/pics
+		vmove usr/share/widelands/scripting
+		vmove usr/share/widelands/sound
+		vmove usr/share/widelands/tribes
+		vmove usr/share/widelands/txts
+		vmove usr/share/widelands/worlds
+	}
+}