diff --git a/x11/herbstluftwm/Makefile b/x11/herbstluftwm/Makefile
index 8db09b9ab5b..df6124ae357 100644
--- a/x11/herbstluftwm/Makefile
+++ b/x11/herbstluftwm/Makefile
@@ -1,29 +1,33 @@
-# $OpenBSD: Makefile,v 1.4 2015/08/25 13:18:28 sthen Exp $
+# $OpenBSD: Makefile,v 1.5 2016/04/29 08:57:52 jca Exp $
 
 COMMENT =	manual tiling window manager
-DISTNAME =	herbstluftwm-0.6.2
+DISTNAME =	herbstluftwm-0.7.0
 CATEGORIES =	x11
-REVISION =	1
 
 HOMEPAGE =	http://herbstluftwm.org/
 
+MAINTAINER =	Florian Stinglmayr <florian@n0la.org>
+
 # BSD
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB += X11 Xext Xinerama c glib-2.0 pthread
+WANTLIB += X11 Xext Xinerama c estdc++ glib-2.0 intl m pthread
 
 MASTER_SITES =	http://herbstluftwm.org/tarballs/
 
-MODULES =	devel/gettext
+MODULES =	gcc4
 
-LIB_DEPENDS =	devel/glib2
+MODGCC4_LANGS=	c++
+MODGCC4_ARCHS=	*
 
-RUN_DEPENDS =	devel/desktop-file-utils \
+LIB_DEPENDS +=	devel/glib2
+
+RUN_DEPENDS +=	devel/desktop-file-utils \
 		shells/bash \
 		x11/dzen2,-gadgets
 
 USE_GMAKE =	Yes
-MAKE_FLAGS =	CC="${CC}" LDFLAGS= VERBOSE= COLOR=0
+MAKE_FLAGS =	LDFLAGS= VERBOSE= COLOR=0
 
 BASEDIR =	${PREFIX}/share/examples/herbstluftwm
 FAKE_FLAGS =	SYSCONFDIR="${BASEDIR}" \
@@ -34,8 +38,4 @@ FAKE_FLAGS =	SYSCONFDIR="${BASEDIR}" \
 
 NO_TEST =	Yes
 
-post-patch:
-	perl -pi -e "s,^#!/bin/bash,#!${LOCALBASE}/bin/bash," \
-		`grep -Rl /bin/bash ${WRKSRC}/*`
-
 .include <bsd.port.mk>
diff --git a/x11/herbstluftwm/distinfo b/x11/herbstluftwm/distinfo
index 8950dd7eb59..335bc828efb 100644
--- a/x11/herbstluftwm/distinfo
+++ b/x11/herbstluftwm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (herbstluftwm-0.6.2.tar.gz) = qJ9cOXrufxqjs53VO8Z+KCZ58C8cC/PDPEGmCOIX8Kw=
-SIZE (herbstluftwm-0.6.2.tar.gz) = 224191
+SHA256 (herbstluftwm-0.7.0.tar.gz) = fi/8MLeRFAcjCl7rYeBEzqeFV5mRB9NyvC28PYLQric=
+SIZE (herbstluftwm-0.7.0.tar.gz) = 247469
diff --git a/x11/herbstluftwm/pkg/PLIST b/x11/herbstluftwm/pkg/PLIST
index 69b589802c0..1466b30de42 100644
--- a/x11/herbstluftwm/pkg/PLIST
+++ b/x11/herbstluftwm/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2014/04/05 05:42:07 bcallah Exp $
+@comment $OpenBSD: PLIST,v 1.3 2016/04/29 08:57:52 jca Exp $
+@bin bin/dmenu_run_hlwm
 @bin bin/herbstclient
 @bin bin/herbstluftwm
 @man man/man1/herbstclient.1
@@ -7,9 +8,9 @@
 share/applications/herbstluftwm.desktop
 share/doc/herbstluftwm/
 share/doc/herbstluftwm/BUGS
+share/doc/herbstluftwm/INSTALL
 share/doc/herbstluftwm/LICENSE
 share/doc/herbstluftwm/NEWS
-share/doc/herbstluftwm/README
 share/doc/herbstluftwm/herbstclient.html
 share/doc/herbstluftwm/herbstluftwm-tutorial.html
 share/doc/herbstluftwm/herbstluftwm.html
@@ -29,9 +30,12 @@ share/examples/herbstluftwm/keychain.sh
 share/examples/herbstluftwm/lasttag.sh
 share/examples/herbstluftwm/layout.sh
 share/examples/herbstluftwm/loadstate.sh
+share/examples/herbstluftwm/maximize.sh
 share/examples/herbstluftwm/q3terminal.sh
 share/examples/herbstluftwm/savestate.sh
 share/examples/herbstluftwm/scratchpad.sh
+share/examples/herbstluftwm/toggledualhead.sh
+share/examples/herbstluftwm/windowmenu.sh
 share/examples/herbstluftwm/wselect.sh
 share/examples/herbstluftwm/xdg/
 share/examples/herbstluftwm/xdg/herbstluftwm/