diff --git a/srcpkgs/mcwm/template b/srcpkgs/mcwm/template
new file mode 100644
index 0000000000..33af5b522f
--- /dev/null
+++ b/srcpkgs/mcwm/template
@@ -0,0 +1,28 @@
+# Template file for 'mcwm'
+pkgname=mcwm
+version=20130209-2
+revision=1
+build_style=gnu-makefile
+makedepends="libxcb-devel xcb-proto xcb-util-devel xcb-util-keysyms-devel xcb-util-wm-devel"
+short_desc="A minimalist stacking X window manager based on XCB"
+maintainer="Ypnose <linuxienATlegtuxDOTorg>"
+license="ISC"
+homepage="http://hack.org/mc/projects/mcwm/"
+distfiles="http://hack.org/mc/hacks/$pkgname/$pkgname-$version.tar.bz2"
+checksum=2d2f9ced77bc6f90cb9fbdbf790eed97f3be28caefb0de496ac28813aed606be
+
+do_build() {
+	sed -i 's/man\/man1/share\/man\/man1/g' Makefile
+	make CC=$CC ${makejobs}
+}
+
+do_install() {
+	make PREFIX=/usr DESTDIR=${DESTDIR} install
+	vinstall LICENSE 644 usr/share/licenses/${pkgname}
+}
+
+mcwm_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/slock/template b/srcpkgs/slock/template
index c5e69151c0..7ab2115b6c 100644
--- a/srcpkgs/slock/template
+++ b/srcpkgs/slock/template
@@ -1,9 +1,9 @@
 # Template file for 'slock'
 pkgname=slock
 version=1.1
-revision=1
+revision=2
 hostmakedepends="pkg-config"
-makedepends="libXext-devel"
+makedepends="libX11-devel libXext-devel"
 short_desc="A simple screen locker for X"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -16,11 +16,15 @@ long_desc="
  day when they are out with friends or fetching some food from the local pub."
 
 do_build() {
-	make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 ${makejobs}
+	sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk
+	sed -i 's/CFLAGS =/CFLAGS +=/g' config.mk
+	sed -i 's/LDFLAGS =/LDFLAGS +=/g' config.mk
+	make CC=$CC INCS="-I." LIBS="-lX11 -lXext -lcrypt" ${makejobs}
 }
 
 do_install() {
-	make PREFIX=/usr DESTDIR=${DESTDIR} install
+	make PREFIX=/usr DESTDIR=$DESTDIR install
+	vinstall LICENSE 644 usr/share/licenses/$pkgname
 }
 
 slock_package() {