diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index a984b467e11..24fd72463d3 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,7 +1,7 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
 version=0.7.0
-revision=1
+revision=2
 hostmakedepends="pkg-config"
 makedepends="libXinerama-devel libglib-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
@@ -13,10 +13,12 @@ distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
 checksum=7e2ffc30b7911407230a5eeb61e044cea78557999107d372bc2dbc3d82d0ae27
 
 do_build() {
-	make COLOR=0 CXX=$CXX CC=$CC LD=$CC LDXX=$CXX CFLAGS="$CFLAGS -std=c99"
+	make COLOR=0 CXX="$CXX" CC="$CC" LD="$CC" LDXX="$CXX" \
+		CFLAGS="$CFLAGS -std=c99" LDFLAGS="$LDFLAGS" LDXXFLAGS="$LDFLAGS"
 }
 do_install() {
 	make PREFIX=/usr DESTDIR=${DESTDIR} COLOR=0 install
 	vmkdir usr/share/bash-completion/completions
 	mv ${DESTDIR}/etc/bash_completion.d/* ${DESTDIR}/usr/share/bash-completion/completions
+	vlicense LICENSE
 }