diff --git a/x11-wm/stumpwm/Makefile b/x11-wm/stumpwm/Makefile
index 6550cd87391a..0bb1271a6c20 100644
--- a/x11-wm/stumpwm/Makefile
+++ b/x11-wm/stumpwm/Makefile
@@ -1,86 +1,93 @@
 PORTNAME=	stumpwm
-DISTVERSION=	22.05
-PORTREVISION=	2
+DISTVERSION=	22.05-157
+DISTVERSIONSUFFIX=	-g740e945
 CATEGORIES=	x11-wm lisp
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	Tiling, keyboard driven Window Manager written in Common Lisp
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	cl-alexandria>=0:devel/cl-alexandria \
 		cl-alexandria-sbcl>=0:devel/cl-alexandria-sbcl \
 		cl-clx>=0:x11/cl-clx \
 		cl-clx-sbcl>=0:x11/cl-clx-sbcl \
 		cl-ppcre>=0:textproc/cl-ppcre \
 		cl-ppcre-sbcl>=0:textproc/cl-ppcre-sbcl \
 		texinfo>=0:print/texinfo
 RUN_DEPENDS=	cl-alexandria>=0:devel/cl-alexandria \
 		cl-alexandria-sbcl>=0:devel/cl-alexandria-sbcl \
 		cl-clx>=0:x11/cl-clx \
 		cl-clx-sbcl>=0:x11/cl-clx-sbcl \
 		cl-ppcre>=0:textproc/cl-ppcre \
 		cl-ppcre-sbcl>=0:textproc/cl-ppcre-sbcl
 
 USE_GITHUB=	yes
 USE_SBCL=	yes
 
 SUB_FILES=	stumpwm
 SUB_LIST=	ASDF_REGISTRY=${ASDF_REGISTRY} \
 		SBCL=${SBCL}
 
 INFO=		${PORTNAME}
 PLIST_SUB=	ASDF_PATHNAME="${ASDF_PATHNAME:S,^${PREFIX}/,,}" \
 		ASDF_REGISTRY="${ASDF_REGISTRY:S,^${PREFIX}/,,}"
 PORTDOCS=	AUTHORS COPYING HACKING NEWS README.md
 PORTEXAMPLES=	sample-stumpwmrc.lisp
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${CP} ${WRKSRC}/load-stumpwm.lisp.in ${WRKSRC}/load-stumpwm.lisp
 	@${REINPLACE_CMD} -e 's|@STUMPWM_ASDF_DIR@|${ASDF_PATHNAME}|' \
 		${WRKSRC}/load-stumpwm.lisp
 	${CP} ${WRKSRC}/make-image.lisp.in ${WRKSRC}/make-image.lisp
 	@${REINPLACE_CMD} -e 's|@MODULE_DIR@|${DATADIR}|' \
 		${WRKSRC}/make-image.lisp
 
 do-build:
 	(cd ${WRKSRC} && \
 		CL_SOURCE_REGISTRY="${WRKSRC}" \
 		ASDF_OUTPUT_TRANSLATIONS="/:" \
 		FBSD_ASDF_COMPILE_PORT=t PORTNAME=${PORTNAME} WRKSRC=${WRKSRC}/ \
 		${SBCL} \
-		--noinform --no-sysinit --no-userinit \
+		--noinform --non-interactive --no-sysinit --no-userinit \
+		--eval "(setf sb-impl::*default-external-format* :UTF-8)" \
 		--eval '#.(load "${LOCALBASE}/etc/asdf-init")' \
 		--eval "(asdf:oos 'asdf:compile-op :${PORTNAME} :force t)" \
 		--eval '(load "load-stumpwm.lisp")' \
 		--eval '(load "manual.lisp")' \
 		--eval '(stumpwm::generate-manual)' \
 		--eval '(sb-ext:quit)' && \
 		makeinfo stumpwm.texi)
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${ASDF_PATHNAME} \
-		${STAGEDIR}${ASDF_REGISTRY} \
-		${STAGEDIR}${ASDF_PATHNAME}/sbclfasl
+	@${MKDIR} ${STAGEDIR}${ASDF_PATHNAME}/dynamic-mixins/src \
+		${STAGEDIR}${ASDF_PATHNAME}/sbclfasl/dynamic-mixins/src \
+		${STAGEDIR}${ASDF_REGISTRY}
 	${INSTALL_SCRIPT} ${WRKDIR}/stumpwm ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/.dir-locals.el ${WRKSRC}/${PORTNAME}.asd \
 		${WRKSRC}/*.lisp ${STAGEDIR}${ASDF_PATHNAME}
+	 ${INSTALL_DATA} ${WRKSRC}/dynamic-mixins/dynamic-mixins.asd \
+		${STAGEDIR}${ASDF_PATHNAME}/dynamic-mixins/
+	${INSTALL_DATA} ${WRKSRC}/dynamic-mixins/src/*.lisp \
+		${STAGEDIR}${ASDF_PATHNAME}/dynamic-mixins/src/
 	${INSTALL_DATA} ${WRKSRC}/*.fasl ${STAGEDIR}${ASDF_PATHNAME}/sbclfasl
+	${INSTALL_DATA} ${WRKSRC}/dynamic-mixins/src/*.fasl \
+		${STAGEDIR}${ASDF_PATHNAME}/sbclfasl/dynamic-mixins/src
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.info \
 		${STAGEDIR}${PREFIX}/${INFO_PATH}
 	@${RLN} ${STAGEDIR}${ASDF_PATHNAME}/${PORTNAME}.asd \
 		${STAGEDIR}${ASDF_REGISTRY}
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTEXAMPLES} ${STAGEDIR}/${EXAMPLESDIR}
 
 .include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
diff --git a/x11-wm/stumpwm/distinfo b/x11-wm/stumpwm/distinfo
index c70214dd2120..5f4db8d6abca 100644
--- a/x11-wm/stumpwm/distinfo
+++ b/x11-wm/stumpwm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1653441154
-SHA256 (stumpwm-stumpwm-22.05_GH0.tar.gz) = d843302f9ce54660bc96e4f0d8e9584f07a81d43c4c26357d5a29cb07194abae
-SIZE (stumpwm-stumpwm-22.05_GH0.tar.gz) = 238196
+TIMESTAMP = 1661384264
+SHA256 (stumpwm-stumpwm-22.05-157-g740e945_GH0.tar.gz) = 57b3d723e7342639826828c44bc2711e4ff78b1e940e14ab8d26322021814b23
+SIZE (stumpwm-stumpwm-22.05-157-g740e945_GH0.tar.gz) = 273076
diff --git a/x11-wm/stumpwm/pkg-plist b/x11-wm/stumpwm/pkg-plist
index 83e22aff03ce..730522ea47fb 100644
--- a/x11-wm/stumpwm/pkg-plist
+++ b/x11-wm/stumpwm/pkg-plist
@@ -1,99 +1,108 @@
+bin/stumpwm
 %%ASDF_PATHNAME%%/.dir-locals.el
 %%ASDF_PATHNAME%%/bindings.lisp
 %%ASDF_PATHNAME%%/color.lisp
 %%ASDF_PATHNAME%%/command.lisp
 %%ASDF_PATHNAME%%/core.lisp
 %%ASDF_PATHNAME%%/debug.lisp
 %%ASDF_PATHNAME%%/dynamic-group.lisp
+%%ASDF_PATHNAME%%/dynamic-mixins/dynamic-mixins.asd
+%%ASDF_PATHNAME%%/dynamic-mixins/src/dynamic-mixins.lisp
+%%ASDF_PATHNAME%%/dynamic-mixins/src/package.lisp
 %%ASDF_PATHNAME%%/dynamic-window.lisp
 %%ASDF_PATHNAME%%/events.lisp
 %%ASDF_PATHNAME%%/fdump.lisp
 %%ASDF_PATHNAME%%/floating-group.lisp
 %%ASDF_PATHNAME%%/font-rendering.lisp
 %%ASDF_PATHNAME%%/group.lisp
 %%ASDF_PATHNAME%%/head.lisp
 %%ASDF_PATHNAME%%/help.lisp
 %%ASDF_PATHNAME%%/input.lisp
 %%ASDF_PATHNAME%%/interactive-keymap.lisp
 %%ASDF_PATHNAME%%/ioloop.lisp
 %%ASDF_PATHNAME%%/iresize.lisp
 %%ASDF_PATHNAME%%/keysyms.lisp
 %%ASDF_PATHNAME%%/keytrans.lisp
 %%ASDF_PATHNAME%%/kmap.lisp
 %%ASDF_PATHNAME%%/load-stumpwm.lisp
 %%ASDF_PATHNAME%%/main.lisp
 %%ASDF_PATHNAME%%/make-image.lisp
 %%ASDF_PATHNAME%%/manual.lisp
 %%ASDF_PATHNAME%%/menu-declarations.lisp
 %%ASDF_PATHNAME%%/menu-definitions.lisp
 %%ASDF_PATHNAME%%/message-window.lisp
+%%ASDF_PATHNAME%%/minor-modes.lisp
 %%ASDF_PATHNAME%%/mode-line-formatters.lisp
 %%ASDF_PATHNAME%%/mode-line.lisp
 %%ASDF_PATHNAME%%/module.lisp
 %%ASDF_PATHNAME%%/package.lisp
 %%ASDF_PATHNAME%%/pathnames.lisp
 %%ASDF_PATHNAME%%/primitives.lisp
 %%ASDF_PATHNAME%%/remap-keys.lisp
+%%ASDF_PATHNAME%%/replace-class.lisp
 %%ASDF_PATHNAME%%/sample-stumpwmrc.lisp
 %%ASDF_PATHNAME%%/sbclfasl/bindings.fasl
 %%ASDF_PATHNAME%%/sbclfasl/color.fasl
 %%ASDF_PATHNAME%%/sbclfasl/command.fasl
 %%ASDF_PATHNAME%%/sbclfasl/core.fasl
 %%ASDF_PATHNAME%%/sbclfasl/debug.fasl
 %%ASDF_PATHNAME%%/sbclfasl/dynamic-group.fasl
+%%ASDF_PATHNAME%%/sbclfasl/dynamic-mixins/src/dynamic-mixins.fasl
+%%ASDF_PATHNAME%%/sbclfasl/dynamic-mixins/src/package.fasl
 %%ASDF_PATHNAME%%/sbclfasl/dynamic-window.fasl
 %%ASDF_PATHNAME%%/sbclfasl/events.fasl
 %%ASDF_PATHNAME%%/sbclfasl/fdump.fasl
 %%ASDF_PATHNAME%%/sbclfasl/floating-group.fasl
 %%ASDF_PATHNAME%%/sbclfasl/font-rendering.fasl
 %%ASDF_PATHNAME%%/sbclfasl/group.fasl
 %%ASDF_PATHNAME%%/sbclfasl/head.fasl
 %%ASDF_PATHNAME%%/sbclfasl/help.fasl
 %%ASDF_PATHNAME%%/sbclfasl/input.fasl
 %%ASDF_PATHNAME%%/sbclfasl/interactive-keymap.fasl
 %%ASDF_PATHNAME%%/sbclfasl/ioloop.fasl
 %%ASDF_PATHNAME%%/sbclfasl/iresize.fasl
 %%ASDF_PATHNAME%%/sbclfasl/keysyms.fasl
 %%ASDF_PATHNAME%%/sbclfasl/keytrans.fasl
 %%ASDF_PATHNAME%%/sbclfasl/kmap.fasl
 %%ASDF_PATHNAME%%/sbclfasl/manual.fasl
 %%ASDF_PATHNAME%%/sbclfasl/menu-declarations.fasl
 %%ASDF_PATHNAME%%/sbclfasl/menu-definitions.fasl
 %%ASDF_PATHNAME%%/sbclfasl/message-window.fasl
+%%ASDF_PATHNAME%%/sbclfasl/minor-modes.fasl
 %%ASDF_PATHNAME%%/sbclfasl/mode-line-formatters.fasl
 %%ASDF_PATHNAME%%/sbclfasl/mode-line.fasl
 %%ASDF_PATHNAME%%/sbclfasl/module.fasl
 %%ASDF_PATHNAME%%/sbclfasl/package.fasl
 %%ASDF_PATHNAME%%/sbclfasl/pathnames.fasl
 %%ASDF_PATHNAME%%/sbclfasl/primitives.fasl
 %%ASDF_PATHNAME%%/sbclfasl/remap-keys.fasl
+%%ASDF_PATHNAME%%/sbclfasl/replace-class.fasl
 %%ASDF_PATHNAME%%/sbclfasl/screen.fasl
 %%ASDF_PATHNAME%%/sbclfasl/selection.fasl
 %%ASDF_PATHNAME%%/sbclfasl/stumpwm.fasl
 %%ASDF_PATHNAME%%/sbclfasl/tile-group.fasl
 %%ASDF_PATHNAME%%/sbclfasl/tile-window.fasl
 %%ASDF_PATHNAME%%/sbclfasl/time.fasl
 %%ASDF_PATHNAME%%/sbclfasl/timers.fasl
 %%ASDF_PATHNAME%%/sbclfasl/user.fasl
 %%ASDF_PATHNAME%%/sbclfasl/version.fasl
 %%ASDF_PATHNAME%%/sbclfasl/window-placement.fasl
 %%ASDF_PATHNAME%%/sbclfasl/window.fasl
 %%ASDF_PATHNAME%%/sbclfasl/wrappers.fasl
 %%ASDF_PATHNAME%%/sbclfasl/wse.fasl
 %%ASDF_PATHNAME%%/screen.lisp
 %%ASDF_PATHNAME%%/selection.lisp
 %%ASDF_PATHNAME%%/stumpwm.asd
 %%ASDF_PATHNAME%%/stumpwm.lisp
 %%ASDF_PATHNAME%%/test-wm.lisp
 %%ASDF_PATHNAME%%/tile-group.lisp
 %%ASDF_PATHNAME%%/tile-window.lisp
 %%ASDF_PATHNAME%%/time.lisp
 %%ASDF_PATHNAME%%/timers.lisp
 %%ASDF_PATHNAME%%/user.lisp
 %%ASDF_PATHNAME%%/version.lisp
 %%ASDF_PATHNAME%%/window-placement.lisp
 %%ASDF_PATHNAME%%/window.lisp
 %%ASDF_PATHNAME%%/wrappers.lisp
 %%ASDF_PATHNAME%%/wse.lisp
 %%ASDF_REGISTRY%%/stumpwm.asd
-bin/stumpwm