diff --git a/srcpkgs/cavestory/files/cavestory b/srcpkgs/cavestory/files/cavestory
new file mode 100755
index 00000000000..61ea9c77514
--- /dev/null
+++ b/srcpkgs/cavestory/files/cavestory
@@ -0,0 +1,2 @@
+#!/bin/sh
+env LD_LIBRARY_PATH=/usr/share/cavestory /usr/share/cavestory/doukutsu.bin "$@"
diff --git a/srcpkgs/cavestory/files/cavestory.desktop b/srcpkgs/cavestory/files/cavestory.desktop
new file mode 100644
index 00000000000..5cbeb7f96da
--- /dev/null
+++ b/srcpkgs/cavestory/files/cavestory.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Cavestory
+GenericName=Doukutsu Monogatari
+Comment=A Japanese freeware PC side-scrolling platformer game
+Exec=/usr/bin/cavestory
+Icon=cavestory.png
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Game;
diff --git a/srcpkgs/cavestory/files/cavestory.png b/srcpkgs/cavestory/files/cavestory.png
new file mode 100644
index 00000000000..349a67d8aa3
Binary files /dev/null and b/srcpkgs/cavestory/files/cavestory.png differ
diff --git a/srcpkgs/cavestory/template b/srcpkgs/cavestory/template
new file mode 100644
index 00000000000..70bffcef50c
--- /dev/null
+++ b/srcpkgs/cavestory/template
@@ -0,0 +1,26 @@
+# Template file for 'cavestory'
+pkgname=cavestory
+version=1.01
+revision=1
+wrksrc=linuxDoukutsu-${version}
+only_for_archs="i686 x86_64"
+short_desc="A Japanese side-scrolling platformer game"
+repository=nonfree
+maintainer="Diogo Leal <diogo@diogoleal.com>"
+license="Proprietary"
+homepage="http://www.cavestory.org/"
+distfiles="http://www.cavestory.org/downloads/linuxdoukutsu-${version}.tar.bz2"
+checksum=76466fc1b1901ce25e301a4ec8450aced806c9d499d66707d6f7b38efebc24c1
+
+do_install(){
+	vmkdir usr/share/cavestory
+	vcopy Config.dat usr/share/cavestory
+	vcopy data usr/share/cavestory
+	vdoc doc/readme.txt
+	vdoc doc/configfileformat.txt
+	vcopy doukutsu.bin usr/share/cavestory
+	vcopy libSDL-1.2.so.0 usr/share/cavestory
+	vbin ${FILESDIR}/cavestory
+	vinstall ${FILESDIR}/cavestory.desktop 644 usr/share/applications/
+	vinstall ${FILESDIR}/cavestory.png 644 usr/share/pixmaps/
+}