diff --git a/srcpkgs/openttd-data b/srcpkgs/openttd-data
deleted file mode 120000
index 550b7b6222f..00000000000
--- a/srcpkgs/openttd-data
+++ /dev/null
@@ -1 +0,0 @@
-openttd
\ No newline at end of file
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index 47df4a01b56..96459813ae1 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,14 +1,16 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.2
-revision=1
+revision=2
 _gfxver=0.6.0
 _sfxver=0.2.3
+create_wrksrc=yes
+build_wrksrc=openttd-$version
 build_style=gnu-configure
 hostmakedepends="pkg-config unzip tar"
 makedepends="SDL-devel icu-devel fontconfig-devel libpng-devel lzo-devel liblzma-devel
  libxdg-basedir-devel"
-depends="openttd-data hicolor-icon-theme"
+depends="hicolor-icon-theme"
 short_desc="Open Source version of Transport Tycoon Deluxe"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-only, Zlib"
@@ -24,8 +26,8 @@ checksum="939c55d259fb13cb47dfb3244e8f7b9e2f723883ebb2119410d8a282724eb6f5
 CXXFLAGS=' -DU_USING_ICU_NAMESPACE=1'
 
 post_extract() {
-	cd ${XBPS_BUILDDIR}
-	tar xf opengfx-${_gfxver}.tar
+	cd $wrksrc
+	bsdtar xf opengfx-${_gfxver}.tar
 	rm opengfx-${_gfxver}.tar
 }
 
@@ -43,18 +45,13 @@ do_configure() {
 		--with-xdg-basedir
 }
 
-openttd-data_package() {
-	short_desc+=" - data files"
-	archs=noarch
-	pkg_install() {
-		vmove usr/share/openttd
-		vmkdir usr/share/openttd/data
-		vcopy ${XBPS_BUILDDIR}/opengfx-${_gfxver}/*.grf usr/share/openttd/data
-		vcopy ${XBPS_BUILDDIR}/opengfx-${_gfxver}/*.obg usr/share/openttd/data
-		vcopy ${XBPS_BUILDDIR}/opensfx-${_sfxver}/opensfx.* usr/share/openttd/data
-		vlicense ${XBPS_BUILDDIR}/opengfx-${_gfxver}/license.txt LICENSE-gfx
-		vlicense ${XBPS_BUILDDIR}/opensfx-${_sfxver}/license.txt LICENSE-sfx
-		vdoc ${XBPS_BUILDDIR}/opengfx-${_gfxver}/readme.txt README-gfx
-		vdoc ${XBPS_BUILDDIR}/opensfx-${_sfxver}/readme.txt README-sfx
-	}
+post_install() {
+	vmkdir usr/share/openttd/data
+	vcopy ../opengfx-${_gfxver}/*.grf usr/share/openttd/data
+	vcopy ../opengfx-${_gfxver}/*.obg usr/share/openttd/data
+	vcopy ../opensfx-${_sfxver}/opensfx.* usr/share/openttd/data
+	vlicense ../opengfx-${_gfxver}/license.txt LICENSE-gfx
+	vlicense ../opensfx-${_sfxver}/license.txt LICENSE-sfx
+	vdoc ../opengfx-${_gfxver}/readme.txt README-gfx
+	vdoc ../opensfx-${_sfxver}/readme.txt README-sfx
 }