diff --git a/x11-wm/notion/Makefile b/x11-wm/notion/Makefile
index 84b60589a461..c904d8bc363b 100644
--- a/x11-wm/notion/Makefile
+++ b/x11-wm/notion/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	notion
-DISTVERSION=	4.0.3
+DISTVERSION=	4.0.5
 CATEGORIES=	x11-wm
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Tiling tabbed window manager
 WWW=		https://notionwm.net/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	gsed:textproc/gsed
 
 USES=		gettext gmake localbase lua pkgconfig readline xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	raboof
 USE_XORG=	ice sm x11 xext
 
 BINARY_ALIAS=	sed=gsed
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		DOCS XINERAMA XRANDR
 OPTIONS_DEFAULT=	XINERAMA XRANDR
 OPTIONS_SUB=		yes
 
 XINERAMA_DESC=	Xinerama module support
 XRANDR_DESC=	Xrandr module support
 
 XINERAMA_USE=	XORG=xinerama
 XRANDR_USE=	XORG=xrandr
 
 .include <bsd.port.options.mk>
 
 post-patch:
 .if !${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e '/^_install:/,/^$$/ d' ${WRKSRC}/Makefile
 .endif
 .if !${PORT_OPTIONS:MXINERAMA}
 	@${REINPLACE_CMD} -e 's|mod_xinerama||' ${WRKSRC}/modulelist.mk
 .endif
 .if !${PORT_OPTIONS:MXRANDR}
 	@${REINPLACE_CMD} -e 's|mod_xrandr||' ${WRKSRC}/modulelist.mk
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-wm/notion/distinfo b/x11-wm/notion/distinfo
index b3604c3352b9..cf878cc3a110 100644
--- a/x11-wm/notion/distinfo
+++ b/x11-wm/notion/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739028832
-SHA256 (raboof-notion-4.0.3_GH0.tar.gz) = f32095fadf1b2dd242ee4aaceda239591a0ba121209323b13709efefa0b515b0
-SIZE (raboof-notion-4.0.3_GH0.tar.gz) = 790736
+TIMESTAMP = 1785096101
+SHA256 (raboof-notion-4.0.5_GH0.tar.gz) = 5a99f9647fda7f5354bee66172d406ab708a71971c1196f3989e8db744214144
+SIZE (raboof-notion-4.0.5_GH0.tar.gz) = 794165
diff --git a/x11-wm/notion/files/patch-system-autodetect.mk b/x11-wm/notion/files/patch-system-autodetect.mk
index 1abd058f8cf6..ecbb0cc859e0 100644
--- a/x11-wm/notion/files/patch-system-autodetect.mk
+++ b/x11-wm/notion/files/patch-system-autodetect.mk
@@ -1,10 +1,28 @@
---- system-autodetect.mk.orig	2025-02-08 16:04:21 UTC
+Apply llvm22 fix from OpenBSD port by commenting
+POSIX_SOURCE and XOPEN_SOURCE.
+fda9c504296741 ("update to notion-4.0.5, unbreaking build with llvm22")
+
+--- system-autodetect.mk.orig	2026-04-21 20:44:17 UTC
 +++ system-autodetect.mk
 @@ -138,6 +138,7 @@ HAS_SYSTEM_ASPRINTF=1
  
  # On some other systems you may something like this:
  #LIBS += -L/usr/local/lib -lintl
 +LIBS += -L$(LOCALBASE)/lib -lintl
  #CPPFLAGS += -I/usr/local/include
  
  
+@@ -195,11 +196,11 @@ EXPORT_DYNAMIC=-Xlinker --export-dynamic
+ 
+ #C89_SOURCE=-ansi
+ 
+-POSIX_SOURCE?=-D_POSIX_C_SOURCE=200112L
++#POSIX_SOURCE?=-D_POSIX_C_SOURCE=200112L
+ BSD_SOURCE?=-D_BSD_SOURCE
+ 
+ # Most systems
+-XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED
++#XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED
+ # SunOS, (Irix)
+ #XOPEN_SOURCE=-D__EXTENSIONS__
+