diff --git a/srcpkgs/cavestory/files/cavestory b/srcpkgs/cavestory/files/cavestory
index 930cc3ce5f9..2c8c339baa9 100755
--- a/srcpkgs/cavestory/files/cavestory
+++ b/srcpkgs/cavestory/files/cavestory
@@ -1,3 +1,3 @@
 #!/bin/sh
-cd /usr/share/cavestory
+cd /usr/libexec/cavestory
 exec ./doukutsu.bin "$@"
diff --git a/srcpkgs/cavestory/template b/srcpkgs/cavestory/template
index ed3665b197a..52d06a0e51d 100644
--- a/srcpkgs/cavestory/template
+++ b/srcpkgs/cavestory/template
@@ -1,26 +1,30 @@
 # Template file for 'cavestory'
 pkgname=cavestory
-version=1.01
-revision=3
-wrksrc=linuxDoukutsu-${version}
-archs="i686"
-lib32mode=full
-repository=nonfree
-short_desc="A Japanese side-scrolling platformer game"
+version=1.2
+revision=1
+archs="x86_64 i686"
+wrksrc=linuxDoukutsu-1.01
+short_desc="Japanese side-scrolling platformer game"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="Proprietary"
+license="custom: proprietary"
 homepage="http://www.cavestory.org/"
-distfiles="http://www.cavestory.org/downloads/linuxdoukutsu-${version}.tar.bz2"
-checksum=76466fc1b1901ce25e301a4ec8450aced806c9d499d66707d6f7b38efebc24c1
+distfiles="http://www.cavestory.org/downloads/linuxdoukutsu-1.01.tar.bz2
+ http://www.cavestory.org/downloads/linuxDoukutsu-${version}.zip"
+checksum="76466fc1b1901ce25e301a4ec8450aced806c9d499d66707d6f7b38efebc24c1
+ a8711393c86cb6a7c6786883b22aed814f0e819cf935f8b273cb9dc5d58cfc6b"
+repository=nonfree
+nopie=yes
 
 do_install() {
-	vmkdir usr/share/cavestory
-	vcopy Config.dat usr/share/cavestory
-	vcopy data usr/share/cavestory
+	vmkdir usr/libexec/cavestory
+	vcopy Config.dat usr/libexec/cavestory
+	vcopy data usr/libexec/cavestory
 	vdoc doc/readme.txt
 	vdoc doc/configfileformat.txt
-	vcopy doukutsu.bin usr/share/cavestory
+	mv ../linuxDoukutsu-${version}/doukutsu_${XBPS_TARGET_WORDSIZE}bits doukutsu.bin
+	vinstall doukutsu.bin 755 usr/libexec/cavestory
 	vbin ${FILESDIR}/cavestory
 	vinstall ${FILESDIR}/cavestory.desktop 644 usr/share/applications/
 	vinstall ${FILESDIR}/cavestory.png 644 usr/share/pixmaps/
+	vlicense doc/readme.txt
 }