diff --git a/srcpkgs/cwm/template b/srcpkgs/cwm/template
index f88829d6e2c..3181570218c 100644
--- a/srcpkgs/cwm/template
+++ b/srcpkgs/cwm/template
@@ -1,24 +1,23 @@
 # Template file for 'cwm
 pkgname=cwm
 version=5.6
-revision=2
+revision=3
+build_style=gnu-makefile
 hostmakedepends="pkg-config bison"
 makedepends="fontconfig-devel libXft-devel libXinerama-devel libXrandr-devel libX11-devel"
 short_desc="Lightweight and efficient window manager for X11"
-maintainer='Juan RP <xtraeme@voidlinux.eu>'
+maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="ISC"
 homepage="http://www.openbsd.org/cgi-bin/man.cgi?query=cwm&manpath=OpenBSD+Current&format=html"
 distfiles="https://github.com/chneukirchen/cwm/archive/v${version}.tar.gz"
 checksum="006320bb1716cc0f93bac5634dcccd01f21d468263b5fc9d1be2dd11078a0625"
 replaces="cwm-git>=0"
 
-do_build() {
-	sed -i 's/^CPPFLAGS+=/CPPFLAGS=/' Makefile
-	sed -i 's/^LDFLAGS+=/LDFLAGS=/' Makefile
+post_extract() {
 	sed -i 's,WAIT_ANY,-1,g' *.c
-	make CC=$CC
+	sed -i 's/^\(LD\|CPP\)FLAGS/override &/' Makefile
+	sed '/\*\//q' calmwm.c >LICENSE
 }
-do_install() {
-	make PREFIX=/usr DESTDIR=${DESTDIR} install
-	vinstall README 644 usr/share/doc/cwm
+post_install() {
+	vlicense LICENSE
 }