diff --git a/x11-wm/dwm/Makefile b/x11-wm/dwm/Makefile
index 1608df6f8eab..223e012fe188 100644
--- a/x11-wm/dwm/Makefile
+++ b/x11-wm/dwm/Makefile
@@ -1,83 +1,83 @@
 PORTNAME=	dwm
-DISTVERSION=	6.3
+DISTVERSION=	6.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://dl.suckless.org/${PORTNAME}/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Dynamic, small, fast and simple window manager
 WWW=		https://dwm.suckless.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
 # Kyua is not used by the upstream to test. It's only used in the port's
 # do-test target.
 TEST_DEPENDS=	${LOCALBASE}/libexec/atf-check:devel/kyua
 
 USES=		xorg
 USE_XORG=	x11 xft
 
 MAKE_ARGS=	CC="${CC}" \
 		FREETYPEINC="${LOCALBASE}/include/freetype2" \
 		PREFIX="${PREFIX}" \
 		VERSION="${PORTVERSION}" \
 		X11INC="${LOCALBASE}/include" \
 		X11LIB="${LOCALBASE}/lib"
 
 SUB_FILES=	dwm.desktop
 SUB_LIST=	COMMENT="${COMMENT}"
 PLIST_FILES=	bin/dwm \
 		share/man/man1/dwm.1.gz \
 		share/xsessions/dwm.desktop
 PORTDOCS=	README
 
 OPTIONS_DEFINE=	DMENUANDSTERM DOCS SUPERASMODKEY VOLUMECONTROL XINERAMA
 OPTIONS_DEFAULT=DMENUANDSTERM XINERAMA
 
 DMENUANDSTERM_DESC=	Install x11/dmenu and x11/sterm as runtime dependencies
 RUGAPS_DESC=		Add resizeable runtime useless gaps
 SUPERASMODKEY_DESC=	Use Super instead of Alt for the dwm mod key
 VOLUMECONTROL_DESC=	Use multimedia keys to raise or lower volume
 
 DMENUANDSTERM_RUN_DEPENDS=	dmenu:x11/dmenu \
 				st:x11/sterm
 
 SUPERASMODKEY_EXTRA_PATCHES=	${PATCHDIR}/superasmodkey-patch-config.def.h
 VOLUMECONTROL_EXTRA_PATCHES=	${PATCHDIR}/volumecontrol-patch-config.def.h
 
 XINERAMA_USE=	XORG=xinerama
 XINERAMA_MAKE_ARGS_OFF=	XINERAMAFLAGS= XINERAMALIBS=
 
 pre-everything::
 	@${ECHO_MSG} "You can build dwm with your own config.h using the DWM_CONF knob:"
 	@${ECHO_MSG} "make DWM_CONF=/path/to/dwm/config.h install clean"
 	@${ECHO_MSG} "Note: Pre-${PORTVERSION} config.h-files may not work."
 
 .if exists(${DWM_CONF})
 post-extract:
 	@${ECHO_MSG} "Creating symlink: config.h -> ${DWM_CONF}"
 	${LN} -fs "${DWM_CONF}" ${WRKSRC}/config.h
 .endif
 
 post-configure:
 	@${REINPLACE_CMD} -E \
 		-e "s|(CFLAGS[[:space:]]*)= |\1+= |" \
 		-e "s|(CPPFLAGS[[:space:]]*)= |\1+= |" \
 		-e "s|(LDFLAGS[[:space:]]*)= |\1+= |" \
 		${WRKSRC}/config.mk
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/dwm
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/xsessions
 	${INSTALL_DATA} ${WRKDIR}/dwm.desktop ${STAGEDIR}${PREFIX}/share/xsessions
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 do-test:
 	${LOCALBASE}/libexec/atf-check -s exit:1 -e match:"dwm-${PORTVERSION}" \
 		${STAGEDIR}${PREFIX}/bin/dwm -v
 
 .include <bsd.port.mk>
diff --git a/x11-wm/dwm/distinfo b/x11-wm/dwm/distinfo
index 26b69f82c174..54501eaf70c4 100644
--- a/x11-wm/dwm/distinfo
+++ b/x11-wm/dwm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1642674880
-SHA256 (dwm-6.3.tar.gz) = badaa028529b1fba1fd7f9a84f3b64f31190466c858011b53e2f7b70c6a3078d
-SIZE (dwm-6.3.tar.gz) = 25351
+TIMESTAMP = 1689174813
+SHA256 (dwm-6.4.tar.gz) = fa9c0d69a584485076cfc18809fd705e5c2080dafb13d5e729a3646ca7703a6e
+SIZE (dwm-6.4.tar.gz) = 25321
diff --git a/x11-wm/dwm/files/volumecontrol-patch-config.def.h b/x11-wm/dwm/files/volumecontrol-patch-config.def.h
index 2a14410402bb..3ab15d4680b9 100644
--- a/x11-wm/dwm/files/volumecontrol-patch-config.def.h
+++ b/x11-wm/dwm/files/volumecontrol-patch-config.def.h
@@ -1,23 +1,24 @@
---- config.def.h.orig	2015-11-08 23:39:37.000000000 +0100
-+++ config.def.h	2018-03-25 21:26:37.860145000 +0200
-@@ -56,7 +56,11 @@
- static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
- static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
+--- config.def.h.orig	2022-10-04 17:38:18 UTC
++++ config.def.h
+@@ -58,7 +58,12 @@ static const Layout layouts[] = {
+ /* commands */
+ static const char *dmenucmd[] = { "dmenu_run", "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
  static const char *termcmd[]  = { "st", NULL };
-+static const char *incrvol[] = { "mixer", "vol", "+1:+1", NULL};
-+static const char *decrvol[] = { "mixer", "vol", "-1:-1", NULL};
++static const char *incrvol[] = { "mixer", "vol", "+1:+1", NULL };
++static const char *decrvol[] = { "mixer", "vol", "-1:-1", NULL };
  
 +#define XK_XF86AudioLowerVolume 0x1008ff11
 +#define XK_XF86AudioRaiseVolume 0x1008ff13
- static Key keys[] = {
++
+ static const Key keys[] = {
  	/* modifier                     key        function        argument */
  	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
-@@ -92,6 +96,8 @@
+@@ -94,6 +99,8 @@ static const Key keys[] = {
  	TAGKEYS(                        XK_8,                      7)
  	TAGKEYS(                        XK_9,                      8)
  	{ MODKEY|ShiftMask,             XK_q,      quit,           {0} },
 +	{ 0x0,                          XK_XF86AudioRaiseVolume,    spawn,           {.v = incrvol } },
 +	{ 0x0,                          XK_XF86AudioLowerVolume,    spawn,           {.v = decrvol } },
  };
  
  /* button definitions */