diff --git a/srcpkgs/cavestory/template b/srcpkgs/cavestory/template
index b08211e1419..3a165e9f2c2 100644
--- a/srcpkgs/cavestory/template
+++ b/srcpkgs/cavestory/template
@@ -3,7 +3,7 @@ pkgname=cavestory
 version=1.2
 revision=2
 archs="x86_64 i686"
-wrksrc=linuxDoukutsu-1.01
+create_wrksrc=yes
 short_desc="Japanese side-scrolling platformer game"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom: proprietary"
@@ -17,12 +17,12 @@ nopie=yes
 
 do_install() {
 	vmkdir usr/libexec/cavestory
-	vcopy Config.dat usr/libexec/cavestory
-	vcopy data usr/libexec/cavestory
-	vdoc doc/readme.txt
-	vdoc doc/configfileformat.txt
-	mv ../linuxDoukutsu-${version}/doukutsu_${XBPS_TARGET_WORDSIZE}bits doukutsu.bin
-	vinstall doukutsu.bin 755 usr/libexec/cavestory
+	vcopy linuxDoukutsu-1.01/Config.dat usr/libexec/cavestory
+	vcopy linuxDoukutsu-1.01/data usr/libexec/cavestory
+	vdoc linuxDoukutsu-1.01/doc/readme.txt
+	vdoc linuxDoukutsu-1.01/doc/configfileformat.txt
+	vinstall linuxDoukutsu-${version}/doukutsu_${XBPS_TARGET_WORDSIZE}bits \
+		755 usr/libexec/cavestory doukutsu.bin
 	vbin ${FILESDIR}/cavestory
 	vinstall ${FILESDIR}/cavestory.desktop 644 usr/share/applications/
 	vinstall ${FILESDIR}/cavestory.png 644 usr/share/pixmaps/