diff --git a/x11-wm/herbstluftwm/Makefile b/x11-wm/herbstluftwm/Makefile
index 0ae0161dbb7e..2bd899ebfc03 100644
--- a/x11-wm/herbstluftwm/Makefile
+++ b/x11-wm/herbstluftwm/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	herbstluftwm
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.9.2
+DISTVERSION=	0.9.4
 CATEGORIES=	x11-wm
 
 MAINTAINER=	uzsolt@uzsolt.hu
 COMMENT=	Manual tiling window manager for X11
 
 LICENSE=	BSD2CLAUSE
 
 BUILD_DEPENDS=	asciidoc:textproc/asciidoc
 LIB_DEPENDS+=	libfreetype.so:print/freetype2
 
 USES=		cmake compiler:c++11-lang gnome \
 		localbase:ldflags pkgconfig shebangfix xorg
 USE_GITHUB=	yes
 USE_GNOME=	glib20
-USE_XORG=	x11 xext xft xinerama xrandr
+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:3.5+,build
 DOCS_CMAKE_BOOL+=	WITH_DOCUMENTATION
 
 DOCS_VARS=	binary_alias=python3=${PYTHON_CMD}
 
 .include <bsd.port.options.mk>
 
 post-patch-EXAMPLES-on:
 	@${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 fa6300836fa4..cd657370c67d 100644
--- a/x11-wm/herbstluftwm/distinfo
+++ b/x11-wm/herbstluftwm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613566681
-SHA256 (herbstluftwm-herbstluftwm-v0.9.2_GH0.tar.gz) = 0f9cca8dd5215a8682692fe98608926090597ca578012950932ef785fd52d188
-SIZE (herbstluftwm-herbstluftwm-v0.9.2_GH0.tar.gz) = 377875
+TIMESTAMP = 1647459452
+SHA256 (herbstluftwm-herbstluftwm-v0.9.4_GH0.tar.gz) = b36e143c2ffbd820c7c00e6a1f0a74bc83fed5eb1bab35411503e68e702a18e3
+SIZE (herbstluftwm-herbstluftwm-v0.9.4_GH0.tar.gz) = 452231
diff --git a/x11-wm/herbstluftwm/files/patch-share_autostart b/x11-wm/herbstluftwm/files/patch-share_autostart
index 539f82888fcc..90dbdd1954e7 100644
--- a/x11-wm/herbstluftwm/files/patch-share_autostart
+++ b/x11-wm/herbstluftwm/files/patch-share_autostart
@@ -1,27 +1,27 @@
---- share/autostart.orig	2020-04-11 07:30:02 UTC
+--- share/autostart.orig	2022-03-17 08:18:57 UTC
 +++ share/autostart
 @@ -62,18 +62,13 @@ hc keybind $Mod-Control-Down    resize down +$resizest
  hc keybind $Mod-Control-Up      resize up +$resizestep
  hc keybind $Mod-Control-Right   resize right +$resizestep
  
 -# tags
 -tag_names=( {1..9} )
 -tag_keys=( {1..9} 0 )
-+# tags are 1..9
  
 -hc rename default "${tag_names[0]}" || true
 -for i in "${!tag_names[@]}" ; do
 -    hc add "${tag_names[$i]}"
 -    key="${tag_keys[$i]}"
--    if ! [ -z "$key" ] ; then
+-    if [ -n "$key" ] ; then
 -        hc keybind "$Mod-$key" use_index "$i"
 -        hc keybind "$Mod-Shift-$key" move_index "$i"
 -    fi
++# tags are 1..9
 +hc rename default "1" || true
 +for i in $(seq 1 9) ; do
 +    hc add "${i}"
 +    hc keybind "$Mod-$key" use_index "$i"
 +    hc keybind "$Mod-Shift-$key" move_index "$i"
  done
  
  # cycle through tags
diff --git a/x11-wm/herbstluftwm/pkg-plist b/x11-wm/herbstluftwm/pkg-plist
index 5382434eb3d8..6d6b2aa6efcd 100644
--- a/x11-wm/herbstluftwm/pkg-plist
+++ b/x11-wm/herbstluftwm/pkg-plist
@@ -1,38 +1,39 @@
 bin/herbstclient
 bin/herbstluftwm
 etc/bash_completion.d/herbstclient
 etc/xdg/herbstluftwm/autostart
 etc/xdg/herbstluftwm/dmenu_run_hlwm
 etc/xdg/herbstluftwm/panel.sh
 etc/xdg/herbstluftwm/restartpanels.sh
 share/fish/vendor_completions.d/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%%man/man1/herbstclient.1.gz
 %%PORTDOCS%%man/man1/herbstluftwm.1.gz
 %%PORTDOCS%%man/man7/herbstluftwm-tutorial.7.gz
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/herbstclient.html
-%%PORTDOCS%%%%DOCSDIR%%/herbstluftwm-tutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/herbstluftwm.html
-%%PORTDOCS%%%%DOCSDIR%%/hlwm-doc.json
 %%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