diff --git a/srcpkgs/thinglaunch-git/template b/srcpkgs/thinglaunch-git/template
deleted file mode 100644
index 181ab32cc77..00000000000
--- a/srcpkgs/thinglaunch-git/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'thinglaunch-git'
-pkgname=thinglaunch-git
-version=20141213
-revision=1
-hostmakedepends="git"
-makedepends="libX11-devel"
-build_style=gnu-makefile
-short_desc="A simple command and password prompter for X11"
-maintainer="Ypnose <linuxienATlegtuxDOTorg>"
-license="MIT"
-homepage="http://git.r-36.net/thinglaunch/"
-provides="thinglaunch-${version}_${revision}"
-replaces="thinglaunch>=0"
-
-do_fetch() {
-	local url="git://git.r-36.net/thinglaunch"
-	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/thinglaunch
-	vinstall LICENSE.orig 644 usr/share/licenses/thinglaunch
-}
diff --git a/srcpkgs/thinglaunch/template b/srcpkgs/thinglaunch/template
new file mode 100644
index 00000000000..b36b87ce146
--- /dev/null
+++ b/srcpkgs/thinglaunch/template
@@ -0,0 +1,25 @@
+# Template file for 'thinglaunch'
+pkgname=thinglaunch
+version=2.4
+revision=1
+makedepends="libX11-devel"
+build_style=gnu-makefile
+make_build_args="INCS=-I. LIBS=-lX11"
+short_desc="A simple command and password prompter for X11"
+maintainer="Ypnose <ypnoseATvoidlinuxDOTeu>"
+license="MIT"
+homepage="http://git.r-36.net/${pkgname}/"
+distfiles="http://git.r-36.net/${pkgname}/snapshot/${pkgname}-${version}.tar.gz"
+checksum="56c7d80ebfc9bba63cf0eb765daec6d1aa893a1eccb2622c1d9cca262d043579"
+replaces="thinglaunch>=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
+}