diff --git a/devel/wf-config/Makefile b/devel/wf-config/Makefile
index 2a90f520ea2b..1930c3e8a942 100644
--- a/devel/wf-config/Makefile
+++ b/devel/wf-config/Makefile
@@ -1,35 +1,34 @@
 PORTNAME=	wf-config
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.7.1
-PORTREVISION=	2
+DISTVERSION=	0.8.0
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Library for managing configuration files, written for wayfire
 WWW=		https://wayfire.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>0:graphics/wayland-protocols \
 		glm>0:math/glm
 LIB_DEPENDS=	libevdev.so:devel/libevdev
 RUN_DEPENDS=	glm>0:math/glm
 TEST_DEPENDS=	doctest>0:devel/doctest
 
 USES=		compiler:c++17-lang gnome meson pkgconfig
 USE_GITHUB=	yes
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	WayfireWM
 MESON_ARGS=	-Dtests=disabled
 
 pre-test:
 	@if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \
 		${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \
 		${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure -Dtests=enabled"; \
 		${TOUCH} ${WRKDIR}/.meson_build_tests; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/devel/wf-config/distinfo b/devel/wf-config/distinfo
index c82d73485ac0..6b22237d4571 100644
--- a/devel/wf-config/distinfo
+++ b/devel/wf-config/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618996393
-SHA256 (WayfireWM-wf-config-v0.7.1_GH0.tar.gz) = 9c212f85bfb26d135610f45865b4401e0c33a0ab3577ac65042eb23ebfe91bdb
-SIZE (WayfireWM-wf-config-v0.7.1_GH0.tar.gz) = 46354
+TIMESTAMP = 1691507819
+SHA256 (WayfireWM-wf-config-v0.8.0_GH0.tar.gz) = 5b69ab8886e2b0e9c5bffa65c5c676c2848fbcc0e67201886a5f2fdd354e25fb
+SIZE (WayfireWM-wf-config-v0.8.0_GH0.tar.gz) = 48539
diff --git a/devel/wf-config/pkg-plist b/devel/wf-config/pkg-plist
index ecab956ecd80..92e3a236a2fe 100644
--- a/devel/wf-config/pkg-plist
+++ b/devel/wf-config/pkg-plist
@@ -1,17 +1,16 @@
 include/wayfire/config/compound-option.hpp
 include/wayfire/config/config-manager.hpp
 include/wayfire/config/file.hpp
 include/wayfire/config/option-types.hpp
 include/wayfire/config/option-wrapper.hpp
 include/wayfire/config/option.hpp
 include/wayfire/config/section.hpp
 include/wayfire/config/types.hpp
 include/wayfire/config/xml.hpp
-include/wayfire/nonstd/optional.hpp
 include/wayfire/util/duration.hpp
 include/wayfire/util/log.hpp
 include/wayfire/util/stringify.hpp
 lib/libwf-config.so
-lib/libwf-config.so.0.7.1
+lib/libwf-config.so.0.8.0
 lib/libwf-config.so.1
 libdata/pkgconfig/wf-config.pc
diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile
index 378f2baa4edd..4dffb82d045b 100644
--- a/x11-wm/wayfire/Makefile
+++ b/x11-wm/wayfire/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	wayfire
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7.5
 PORTREVISION=	1
 CATEGORIES=	x11-wm wayland
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	dd479c06bf84.patch:-p1 # https://github.com/WayfireWM/wayfire/issues/599
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	3D Wayland compositor
 WWW=		https://wayfire.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
-		wf-config>=0.7.0<0.8.0:devel/wf-config \
+		wf-config>=0.7.0<0.9.0:devel/wf-config \
 		${LOCALBASE}/include/xf86drmMode.h:graphics/libdrm \
 		wayland-protocols>=1.12:graphics/wayland-protocols \
 		glm>=0.9.8:math/glm \
 		wlroots>=0.16.0<0.17.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libinotify.so:devel/libinotify \
 		libwf-config.so:devel/wf-config \
 		libpng.so:graphics/png \
 		libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c++17-lang gl gnome jpeg meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_GL=		egl glesv2
 USE_GNOME=	cairo pango
 USE_XORG=	pixman
 GH_ACCOUNT=	WayfireWM
 GH_TUPLE=	WayfireWM:wf-touch:8974eb0:wftouch/subprojects/wf-touch \
 		WayfireWM:wf-utils:889fdaf:wfutils/subprojects/wf-utils
 
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
 
 X11_USE=		XORG=xcb
 X11_MESON_ENABLED=	xwayland
 
 post-patch:
 # Extract (snapshot) version from the port instead of meson.build
 	@${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \
 		-e '/project_version/s/@0@/${DISTVERSIONFULL}/' \
 		${WRKSRC}/meson.build
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-wm/wayfire/files/patch-wf-config-0.8 b/x11-wm/wayfire/files/patch-wf-config-0.8
new file mode 100644
index 000000000000..9ddb792c0f0d
--- /dev/null
+++ b/x11-wm/wayfire/files/patch-wf-config-0.8
@@ -0,0 +1,13 @@
+Dependency wf-config found: NO found 0.8.0 but need: '<0.8.0' ; matched: '>=0.7.0'
+
+--- meson.build.orig	2022-12-01 15:12:48 UTC
++++ meson.build
+@@ -31,7 +31,7 @@ wlroots        = dependency('wlroots', version: ['>=0.
+ threads        = dependency('threads')
+ xkbcommon      = dependency('xkbcommon')
+ wlroots        = dependency('wlroots', version: ['>=0.16.0', '<0.17.0'], required: get_option('use_system_wlroots'))
+-wfconfig       = dependency('wf-config', version: ['>=0.7.0', '<0.8.0'], required: get_option('use_system_wfconfig'))
++wfconfig       = dependency('wf-config', version: ['>=0.7.0', '<0.9.0'], required: get_option('use_system_wfconfig'))
+ 
+ use_system_wlroots = not get_option('use_system_wlroots').disabled() and wlroots.found()
+ if not use_system_wlroots