diff --git a/x11-wm/herbstluftwm/Makefile b/x11-wm/herbstluftwm/Makefile
index c9be093e7d4b..f0f7d1239604 100644
--- a/x11-wm/herbstluftwm/Makefile
+++ b/x11-wm/herbstluftwm/Makefile
@@ -1,45 +1,33 @@
 PORTNAME=	herbstluftwm
-DISTVERSION=	0.9.5
-PORTREVISION=	2
+DISTVERSION=	0.9.6
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://herbstluftwm.org/tarballs/
 
 MAINTAINER=	uzsolt@FreeBSD.org
 COMMENT=	Manual tiling window manager for X11
 WWW=		https://herbstluftwm.org/
 
 LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	asciidoc:textproc/asciidoc
 LIB_DEPENDS=	libfreetype.so:print/freetype2
 RUN_DEPENDS=	bash>0:shells/bash \
 		dzen2>0:x11/dzen2
 
 USES=		cmake compiler:c++11-lang gnome localbase:ldflags pkgconfig \
 		shebangfix xorg
 USE_GNOME=	glib20
 USE_XORG=	x11 xext xfixes xft xinerama xrandr xrender
 
 SHEBANG_FILES=	doc/gendoc.py scripts/*.sh share/*.sh
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=		DOCS EXAMPLES
-OPTIONS_SUB=		yes
-DOCS_USES+=		python:build
-DOCS_CMAKE_BOOL+=	WITH_DOCUMENTATION
-
-DOCS_VARS=	BINARY_ALIAS=python3=${PYTHON_CMD}
-
-.include <bsd.port.options.mk>
-
-post-patch-EXAMPLES-on:
+post-patch:
 	@${REINPLACE_CMD} -e 's,$${DOCDIR}/examples,${EXAMPLESDIR},' ${WRKSRC}/CMakeLists.txt
 
-post-patch-EXAMPLES-off:
-	@${REINPLACE_CMD} -e '\@$${DOCDIR}/examples@d' ${WRKSRC}/CMakeLists.txt
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/herbst*
 
 .include <bsd.port.mk>
diff --git a/x11-wm/herbstluftwm/distinfo b/x11-wm/herbstluftwm/distinfo
index 705be4dfef8f..cded0796fe24 100644
--- a/x11-wm/herbstluftwm/distinfo
+++ b/x11-wm/herbstluftwm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667198432
-SHA256 (herbstluftwm-0.9.5.tar.gz) = b2d4600909e5bece5ad63818dfb30bb19fd2ac9f52847b1a7a74ad4040718105
-SIZE (herbstluftwm-0.9.5.tar.gz) = 556773
+TIMESTAMP = 1775205597
+SHA256 (herbstluftwm-0.9.6.tar.gz) = e38c9721cd5c835ec1d461ab55c9dabcacea8c42eb37aeb782be7b138c91c6eb
+SIZE (herbstluftwm-0.9.6.tar.gz) = 603996
diff --git a/x11-wm/herbstluftwm/pkg-plist b/x11-wm/herbstluftwm/pkg-plist
index b0e9cd15a2d4..22ceb2de1dba 100644
--- a/x11-wm/herbstluftwm/pkg-plist
+++ b/x11-wm/herbstluftwm/pkg-plist
@@ -1,39 +1,39 @@
 bin/herbstclient
 bin/herbstluftwm
 etc/xdg/herbstluftwm/autostart
 etc/xdg/herbstluftwm/dmenu_run_hlwm
 etc/xdg/herbstluftwm/panel.sh
 etc/xdg/herbstluftwm/restartpanels.sh
 share/bash-completion/completions/herbstclient
 share/fish/completions/herbstclient.fish
 share/xsessions/herbstluftwm.desktop
 share/zsh/site-functions/_herbstclient
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/hlwm-doc.json
-%%PORTDOCS%%%%DOCSDIR%%/html/herbstclient.html
-%%PORTDOCS%%%%DOCSDIR%%/html/herbstluftwm-tutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/html/herbstluftwm.html
-%%PORTDOCS%%share/man/man1/herbstclient.1.gz
-%%PORTDOCS%%share/man/man1/herbstluftwm.1.gz
-%%PORTDOCS%%share/man/man7/herbstluftwm-tutorial.7.gz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dmenu.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dumpbeautify.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exec_on_tag.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/execwith.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/float-maximize.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/floatmon.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/herbstcommander.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/keychain.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lasttag.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/layout.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loadstate.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/maximize.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perclient_kb_layout.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/q3terminal.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/savestate.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scratchpad.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/toggledualhead.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/unminimize.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/windowmenu.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wselect.sh
+%%DOCSDIR%%/NEWS
+%%DOCSDIR%%/hlwm-doc.json
+%%DOCSDIR%%/html/herbstclient.html
+%%DOCSDIR%%/html/herbstluftwm-tutorial.html
+%%DOCSDIR%%/html/herbstluftwm.html
+share/man/man1/herbstclient.1.gz
+share/man/man1/herbstluftwm.1.gz
+share/man/man7/herbstluftwm-tutorial.7.gz
+%%EXAMPLESDIR%%/README
+%%EXAMPLESDIR%%/dmenu.sh
+%%EXAMPLESDIR%%/dumpbeautify.sh
+%%EXAMPLESDIR%%/exec_on_tag.sh
+%%EXAMPLESDIR%%/execwith.sh
+%%EXAMPLESDIR%%/float-maximize.sh
+%%EXAMPLESDIR%%/floatmon.sh
+%%EXAMPLESDIR%%/herbstcommander.sh
+%%EXAMPLESDIR%%/keychain.sh
+%%EXAMPLESDIR%%/lasttag.sh
+%%EXAMPLESDIR%%/layout.sh
+%%EXAMPLESDIR%%/loadstate.sh
+%%EXAMPLESDIR%%/maximize.sh
+%%EXAMPLESDIR%%/perclient_kb_layout.sh
+%%EXAMPLESDIR%%/q3terminal.sh
+%%EXAMPLESDIR%%/savestate.sh
+%%EXAMPLESDIR%%/scratchpad.sh
+%%EXAMPLESDIR%%/toggledualhead.sh
+%%EXAMPLESDIR%%/unminimize.sh
+%%EXAMPLESDIR%%/windowmenu.sh
+%%EXAMPLESDIR%%/wselect.sh