diff --git a/srcpkgs/cwm/template b/srcpkgs/cwm/template
index 069bbbef750..9680f1d583e 100644
--- a/srcpkgs/cwm/template
+++ b/srcpkgs/cwm/template
@@ -1,8 +1,7 @@
 # Template file for 'cwm
 pkgname=cwm
 version=5.6
-revision=1
-build_style=gnu-makefile
+revision=2
 hostmakedepends="pkg-config bison"
 makedepends="fontconfig-devel libXft-devel libXinerama-devel libXrandr-devel libX11-devel"
 short_desc="Lightweight and efficient window manager for X11"
@@ -13,11 +12,13 @@ distfiles="https://github.com/chneukirchen/cwm/archive/v${version}.tar.gz"
 checksum="006320bb1716cc0f93bac5634dcccd01f21d468263b5fc9d1be2dd11078a0625"
 replaces="cwm-git>=0"
 
-pre_build() {
+do_build() {
 	sed -i 's/^CPPFLAGS+=/CPPFLAGS=/' Makefile
 	sed -i 's/^LDFLAGS+=/LDFLAGS=/' Makefile
+	sed -i 's,WAIT_ANY,-1,g' *.c
+	make CC=$CC
 }
-
-post_install() {
+do_install() {
+	make PREFIX=/usr DESTDIR=${DESTDIR} install
 	vinstall README 644 usr/share/doc/cwm
 }