diff --git a/x11-wm/obconf/Makefile b/x11-wm/obconf/Makefile
index 83e9a1cd282b..64a258a90ffb 100644
--- a/x11-wm/obconf/Makefile
+++ b/x11-wm/obconf/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	obconf
 PORTVERSION=	2.0.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://openbox.org/dist/obconf/
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Preferences manager for the Openbox window manager
 WWW=		http://openbox.org/wiki/Obconf
 
 LICENSE=		GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
 		libobrender.so:x11-wm/openbox
 
 USES=		desktop-file-utils gnome pkgconfig shared-mime-info
 USE_GNOME=	libglade2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	OPENBOX_CFLAGS="`pkg-config --cflags obrender-3.5 obt-3.5`" \
 		OPENBOX_LIBS="`pkg-config --libs obrender-3.5 obt-3.5`"
 CONFIGURE_ARGS=	--sysconfdir=${STAGEDIR}${PREFIX}/etc/openbox
 MAKE_ARGS=	mkdir_p='${MKDIR}'
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	ABOUT-NLS AUTHORS README TODO
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/x11-wm/obconf/files/patch-src_tree.c b/x11-wm/obconf/files/patch-src_tree.c
new file mode 100644
index 000000000000..705d6fba1bec
--- /dev/null
+++ b/x11-wm/obconf/files/patch-src_tree.c
@@ -0,0 +1,20 @@
+--- src/tree.c.orig	2026-06-08 11:58:29 UTC
++++ src/tree.c
+@@ -88,7 +88,7 @@ void tree_apply()
+ void tree_apply()
+ {
+     gchar *p, *d;
+-    gboolean err;
++    gboolean err = FALSE;
+ 
+     if (obc_config_file)
+         p = g_strdup(obc_config_file);
+@@ -102,6 +102,8 @@ void tree_apply()
+ 
+     if (!obt_xml_save_file(parse_i, p, TRUE)) {
+         gchar *s;
++
++        err = TRUE;
+         s = g_strdup_printf("An error occured while saving the "
+                             "config file '%s'", p);
+         obconf_error(s, FALSE);