diff --git a/x11-wm/herbstluftwm/Makefile b/x11-wm/herbstluftwm/Makefile
--- a/x11-wm/herbstluftwm/Makefile
+++ b/x11-wm/herbstluftwm/Makefile
@@ -11,10 +11,10 @@
 LICENSE=	BSD2CLAUSE
 
 BUILD_DEPENDS=	asciidoc:textproc/asciidoc
-LIB_DEPENDS+=	libfreetype.so:print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
-USES=		cmake compiler:c++11-lang gnome \
-		localbase:ldflags pkgconfig shebangfix xorg
+USES=		cmake compiler:c++11-lang gnome localbase:ldflags pkgconfig \
+		shebangfix xorg
 USE_GNOME=	glib20
 USE_XORG=	x11 xext xfixes xft xinerama xrandr xrender
 
@@ -22,13 +22,11 @@
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
-OPTIONS_SUB=	yes
-DOCS_USES+=	python:build
+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:
diff --git a/x11-wm/herbstluftwm/files/patch-share_autostart b/x11-wm/herbstluftwm/files/patch-share_autostart
--- a/x11-wm/herbstluftwm/files/patch-share_autostart
+++ b/x11-wm/herbstluftwm/files/patch-share_autostart
@@ -1,13 +1,19 @@
---- share/autostart.orig	2022-03-17 08:18:57 UTC
+--- share/autostart.orig	2024-02-25 15:18:23 UTC
 +++ share/autostart
-@@ -62,18 +62,13 @@ hc keybind $Mod-Control-Down    resize down +$resizest
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # this is a simple config for herbstluftwm
+ 
+@@ -62,18 +62,12 @@ hc keybind $Mod-Control-Right   resize right +$resizes
  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 )
- 
+-
 -hc rename default "${tag_names[0]}" || true
 -for i in "${!tag_names[@]}" ; do
 -    hc add "${tag_names[$i]}"
@@ -18,10 +24,10 @@
 -    fi
 +# tags are 1..9
 +hc rename default "1" || true
-+for i in $(seq 1 9) ; do
++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"
++    hc keybind "$Mod-$i" use_index "$i"
++    hc keybind "$Mod-Shift-$i" move_index "$i"
  done
  
  # cycle through tags
diff --git a/x11-wm/herbstluftwm/files/pkg-message.in b/x11-wm/herbstluftwm/files/pkg-message.in
--- a/x11-wm/herbstluftwm/files/pkg-message.in
+++ b/x11-wm/herbstluftwm/files/pkg-message.in
@@ -2,7 +2,8 @@
 {
   message: <<EOM
 You need to specify your own autostart file with -c or place it in this path:
-%%PREFIX%%/etc/xdg/etc/xdg/herbstluftwm/autostart
+%%PREFIX%%/etc/xdg/herbstluftwm/autostart or
+$XDG_CONFIG_HOME/herbstluftwm/autostart.
 
 Keep in mind that most of the scripts are written in bash syntax.
 EOM