diff --git a/srcpkgs/opentyrian-data b/srcpkgs/opentyrian-data
deleted file mode 120000
index 7fa7b8f4ef..0000000000
--- a/srcpkgs/opentyrian-data
+++ /dev/null
@@ -1 +0,0 @@
-opentyrian
\ No newline at end of file
diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template
index a07e85bd29..f7dcb7ed56 100644
--- a/srcpkgs/opentyrian/template
+++ b/srcpkgs/opentyrian/template
@@ -1,45 +1,40 @@
 # Template file for 'opentyrian'
 pkgname=opentyrian
 version=2.1.20130907
-revision=2
+revision=3
 _dataver=21
+create_wrksrc=yes
+build_wrksrc=$pkgname-$version
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
 makedepends="SDL_net-devel"
-depends="${pkgname}-data"
 short_desc="OSS port of the DOS shoot-em-up Tyrian"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
-homepage="https://bitbucket.org/${pkgname}/${pkgname}/wiki/Home"
+license="GPL-2.0-or-later"
+homepage="https://bitbucket.org/opentyrian/opentyrian/wiki/Home"
 distfiles="http://www.camanis.net/${pkgname}/releases/${pkgname}-${version}-src.tar.gz
  http://camanis.net/tyrian/tyrian${_dataver}.zip"
 checksum="f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f
  7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277"
+replaces="opentyrian-data>=0"
 
 CFLAGS="-Wno-error -fcommon"
 
 pre_build() {
-	sed -i ${wrksrc}/Makefile -e "s;-g0;$CFLAGS;"
+	vsed -i Makefile -e "s;-g0;$CFLAGS;"
 }
 do_install() {
 	vbin ${pkgname}
 	vman linux/man/${pkgname}.6
 	vinstall linux/${pkgname}.desktop 644 usr/share/applications
-	vinstall ${wrksrc}/linux/icons/tyrian-128.png 644 usr/share/pixmaps ${pkgname}.png
-	cat <<EOT > ${wrksrc}/manual.txt
+	vinstall linux/icons/tyrian-128.png 644 usr/share/pixmaps ${pkgname}.png
+	vmkdir usr/share/${sourcepkg}/data
+	vcopy "${wrksrc}/tyrian${_dataver}/*" usr/share/${sourcepkg}/data
+	cat <<EOT > manual.txt
 ******** This is the original manual of the DOS game. The install
 instructions are obsolete, while the story and gameplay instructions
 starting in section "V) THE STORY" may still be useful. ********
 EOT
-	sed 's/\r//' ${XBPS_BUILDDIR}/tyrian${_dataver}/manual.doc >> ${wrksrc}/manual.txt
+	sed 's/\r//' ${wrksrc}/tyrian${_dataver}/manual.doc >> manual.txt
 	vdoc manual.txt
 }
-
-opentyrian-data_package() {
-	short_desc+=" - data files"
-	archs=noarch
-	pkg_install() {
-		vmkdir usr/share/${sourcepkg}/data
-		vcopy "${XBPS_BUILDDIR}/tyrian${_dataver}/*" usr/share/${sourcepkg}/data
-	}
-}