diff --git a/srcpkgs/sandy-git/template b/srcpkgs/sandy-git/template
deleted file mode 100644
index 7a3971df09..0000000000
--- a/srcpkgs/sandy-git/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'sandy-git'
-pkgname=sandy-git
-version=20141213
-revision=1
-hostmakedepends="git"
-makedepends="ncurses-devel"
-build_style=gnu-makefile
-short_desc="A simple ncurses text editor"
-maintainer="Ypnose <linuxienATlegtuxDOTorg>"
-license="MIT"
-homepage="http://tools.suckless.org/sandy"
-provides="sandy-${version}_${revision}"
-replaces="sandy>=0"
-
-do_fetch() {
-	local url="git://git.suckless.org/sandy"
-	msg_normal "Fetching source from $url ...\n"
-	git clone ${url} ${pkgname}-${version}
-}
-
-pre_build() {
-	sed -i 's| -I/usr/include||g' config.mk
-	sed -i 's|-L/usr/lib ||g' config.mk
-	sed -i 's|^CPPFLAGS =|CPPFLAGS +=|g' config.mk
-	sed -i 's|^CFLAGS =|CFLAGS +=|g' config.mk
-	sed -i 's|^LDFLAGS =|LDFLAGS +=|g' config.mk
-}
-
-post_install() {
-	vinstall LICENSE 644 usr/share/licenses/sandy
-	vinstall README 644 usr/share/doc/sandy
-}
diff --git a/srcpkgs/sandy/template b/srcpkgs/sandy/template
new file mode 100644
index 0000000000..d2c20ada53
--- /dev/null
+++ b/srcpkgs/sandy/template
@@ -0,0 +1,26 @@
+# Template file for 'sandy'
+pkgname=sandy
+version=0.4
+revision=1
+makedepends="ncurses-devel"
+build_style=gnu-makefile
+make_build_args="INCS=-I. LIBS=-lncurses"
+short_desc="A simple ncurses text editor"
+maintainer="Ypnose <ypnoseATvoidlinuxDOTeu>"
+license="MIT"
+homepage="http://tools.suckless.org/${pkgname}"
+distfiles="http://git.suckless.org/${pkgname}/snapshot/${pkgname}-${version}.tar.gz"
+checksum="7b8eda65ee726ed5aef5f1f719d3d86328959ebcdbca9216fed57f7139382aa7"
+replaces="sandy-git>=0"
+
+pre_build() {
+	sed -i 's|-O0 ||g' config.mk
+	sed -i 's|^CPPFLAGS =|override CPPFLAGS +=|g' config.mk
+	sed -i 's|^CFLAGS =|override CFLAGS +=|g' config.mk
+	sed -i 's|^LDFLAGS =|override LDFLAGS +=|g' config.mk
+}
+
+post_install() {
+	vlicense LICENSE
+	vdoc README
+}