diff --git a/srcpkgs/zynaddsubfx-data b/srcpkgs/zynaddsubfx-data
deleted file mode 120000
index c896b602ef0..00000000000
--- a/srcpkgs/zynaddsubfx-data
+++ /dev/null
@@ -1 +0,0 @@
-zynaddsubfx
\ No newline at end of file
diff --git a/srcpkgs/zynaddsubfx/template b/srcpkgs/zynaddsubfx/template
index 2361d8bd548..04e72410af8 100644
--- a/srcpkgs/zynaddsubfx/template
+++ b/srcpkgs/zynaddsubfx/template
@@ -1,25 +1,26 @@
 # Template file for 'zynaddsubfx'
 pkgname=zynaddsubfx
 version=3.0.5
-revision=2
+revision=3
 build_style=cmake
 build_helper=qemu
 configure_args="-DDefaultOutput=jack -DDefaultInput=jack -DGuiModule=fltk"
 hostmakedepends="doxygen fltk pkg-config"
 makedepends="fltk-devel fftw-devel liblo-devel libXpm-devel mxml-devel
  jack-devel portaudio-devel"
-depends="zynaddsubfx-data>=0"
 short_desc="Open Source software synthesizer"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://zynaddsubfx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
 checksum=7447322268114a1e0ac5f281ac37a09a78e761a7be61999caf79100049789f63
+replaces="zynaddsubfx-data>=0"
 
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		armv5*) configure_args+=" -DSUPPORT_NEON=NO";;
-	esac
+case "$XBPS_TARGET_MACHINE" in
+	armv5*) configure_args+=" -DSUPPORT_NEON=NO";;
+esac
+
+post_patch() {
 	# The x86 assembler check is broken for cross compiling
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64*|i686*);;
@@ -35,19 +36,17 @@ pre_configure() {
 		src/Plugin/Reverb/CMakeLists.txt \
 		src/Plugin/ZynAddSubFX/CMakeLists.txt
 
+	vsed -i -e 's;gcc ;${CC} ;' \
+		-e 's;.fltk-config --cflags.;& ${CFLAGS};' \
+		-e 's;.fltk-config --ldflags.;& ${LDFLAGS};' \
+		ExternalPrograms/Spliter/Makefile \
+		ExternalPrograms/Controller/Makefile
 }
 
 post_build() {
-	local ext
-	for ext in Spliter Controller; do
-		cd ${wrksrc}/ExternalPrograms/${ext}
-		sed -i Makefile \
-			-e 's;`fltk-config --cflags`;& ${CFLAGS};' \
-			-e 's;`fltk-config --ldflags`;& ${LDFLAGS};' \
-			-e 's;gcc ;${CC} ;'
-		# Build external program
-		make ${makejobs}
-	done
+	# Build external program
+	make ${makejobs} -C ExternalPrograms/Spliter
+	make ${makejobs} -C ExternalPrograms/Controller
 }
 post_install() {
 	# Install external programs
@@ -55,10 +54,3 @@ post_install() {
 	vdoc ${wrksrc}/ExternalPrograms/Spliter/readme.txt SPLITER.txt
 	vbin ${wrksrc}/ExternalPrograms/Controller/controller
 }
-zynaddsubfx-data_package() {
-	short_desc+=" - data"
-	archs=noarch
-	pkg_install() {
-		vmove usr/share/${sourcepkg}
-	}
-}