diff -ur herbstluftwm.orig/Makefile herbstluftwm/Makefile
--- herbstluftwm.orig/Makefile	2014-07-02 08:28:32.000000000 +0200
+++ herbstluftwm/Makefile	2014-07-20 18:56:16.000000000 +0200
@@ -2,18 +2,17 @@
 
 PORTNAME=	herbstluftwm
 PORTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://herbstluftwm.org/tarballs/
 
-MAINTAINER=	crshd@mail.com
+MAINTAINER=	udvzsolt@gmail.com
 COMMENT=	Manual tiling window manager for X11
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
-
 USES=		gmake pkgconfig shebangfix
-SHEBANG_FILES=scripts/*.sh
+SHEBANG_FILES=scripts/*.sh share/autostart share/*.sh
 USE_XORG=	x11 xinerama
 USE_GNOME=	glib20
 
@@ -21,9 +20,13 @@
 		DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} \
 		MANDIR=${PREFIX}/man
 
-OPTIONS_DEFINE=	BASH ZSH DOCS EXAMPLES
+OPTIONS_DEFINE=	BASH ZSH DOCS EXAMPLES DEFAULTCONF
+DEFAULTCONF_DESC=Install default configuration (requires bash)
+OPTIONS_DEFAULT+=DEFAULTCONF
 OPTIONS_SUB=	yes
 
+DEFAULTCONF_RUN_DEPENDS=bash:${PORTSDIR}/shells/bash
+
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -40,5 +43,11 @@
 .if ! ${PORT_OPTIONS:MEXAMPLES}
 	${REINPLACE_CMD} -e '/EXAMPLESDIR/d' ${WRKSRC}/Makefile
 .endif
+.if ! ${PORT_OPTIONS:MDEFAULTCONF}
+	${REINPLACE_CMD} -e '/CONFIGDIR/d' ${WRKSRC}/Makefile
+.endif
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/herbst*
 
 .include <bsd.port.mk>
diff -ur herbstluftwm.orig/pkg-plist herbstluftwm/pkg-plist
--- herbstluftwm.orig/pkg-plist	2014-07-02 08:28:32.000000000 +0200
+++ herbstluftwm/pkg-plist	2014-07-02 08:39:29.000000000 +0200
@@ -1,8 +1,8 @@
 bin/herbstclient
 bin/herbstluftwm
-etc/xdg/herbstluftwm/autostart
-etc/xdg/herbstluftwm/panel.sh
-etc/xdg/herbstluftwm/restartpanels.sh
+%%DEFAULTCONF%%etc/xdg/herbstluftwm/autostart
+%%DEFAULTCONF%%etc/xdg/herbstluftwm/panel.sh
+%%DEFAULTCONF%%etc/xdg/herbstluftwm/restartpanels.sh
 %%BASH%%etc/bash_completion.d/herbstclient-completion
 %%BASH%%@dirrmtry etc/bash_completion.d
 man/man1/herbstclient.1.gz
@@ -36,5 +36,5 @@
 %%ZSH%%@dirrmtry share/zsh/functions/Completion
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm etc/xdg/herbstluftwm
-@dirrmtry etc/xdg
+%%DEFAULTCONF%%@dirrm etc/xdg/herbstluftwm
+%%DEFAULTCONF%%@dirrmtry etc/xdg