diff --git a/x11/fuzzel/Makefile b/x11/fuzzel/Makefile
index 20b5a290fc9a..bff93a2d4046 100644
--- a/x11/fuzzel/Makefile
+++ b/x11/fuzzel/Makefile
@@ -1,52 +1,61 @@
 PORTNAME=	fuzzel
-DISTVERSION=	1.7.0
+DISTVERSION=	1.8.0
 CATEGORIES=	x11 wayland
 MASTER_SITES=	https://codeberg.org/dnkl/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Application launcher for wlroots-based Wayland compositors
 WWW=		https://codeberg.org/dnkl/fuzzel
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	tllist>=1.0.1:devel/tllist \
 		wayland-protocols>0:graphics/wayland-protocols \
 		scdoc:textproc/scdoc
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 		libwayland-client.so:graphics/wayland \
 		libfcft.so:x11-fonts/fcft \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c11 meson pkgconfig xorg
 USE_XORG=	pixman
 WRKSRC=		${WRKDIR}/${PORTNAME}
 PLIST_FILES=	bin/${PORTNAME} \
+		"@sample etc/xdg/${PORTNAME}/${PORTNAME}.ini.sample" \
 		man/man1/${PORTNAME}.1.gz \
+		man/man5/${PORTNAME}.ini.5.gz \
 		share/zsh/site-functions/_${PORTNAME}
 
 OPTIONS_DEFINE=	CAIRO LIBRSVG2 PNG
 OPTIONS_DEFAULT=CAIRO LIBRSVG2 PNG
 
 CAIRO_USES=		gnome
 CAIRO_USE=		GNOME=cairo
 CAIRO_MESON_ENABLED=	enable-cairo
 
 LIBRSVG2_USES=		gnome
 LIBRSVG2_USE=		GNOME=librsvg2
 LIBRSVG2_MESON_ON=	-Dsvg-backend=librsvg
 LIBRSVG2_MESON_OFF=	-Dsvg-backend=nanosvg
 LIBRSVG2_IMPLIES=	CAIRO
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_MESON_ON=		-Dpng-backend=libpng
 PNG_MESON_OFF=		-Dpng-backend=none
 
 post-patch:
 # Respect PREFIX for icons
 	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
 		${WRKSRC}/completions/zsh/_${PORTNAME} \
 		${WRKSRC}/xdg.c
+# Respect PREFIX for system-wide config
+	@${REINPLACE_CMD} 's,/etc,${PREFIX}&,' \
+		${WRKSRC}/config.c \
+		${WRKSRC}/doc/*.scd
+# Let @sample handle default files under etc/
+	@${REINPLACE_CMD} -e "/ini/s/'[^']*/&', rename: &.sample/" \
+		${WRKSRC}/meson.build
 
 .include <bsd.port.mk>
diff --git a/x11/fuzzel/distinfo b/x11/fuzzel/distinfo
index 2b22642dbff2..98d4431c2b0c 100644
--- a/x11/fuzzel/distinfo
+++ b/x11/fuzzel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1644079619
-SHA256 (fuzzel-1.7.0.tar.gz) = f792c9869ec2ab333e99ff49d3e94a81c7ffc45767b74ed98c63404f558a008b
-SIZE (fuzzel-1.7.0.tar.gz) = 399615
+TIMESTAMP = 1666528623
+SHA256 (fuzzel-1.8.0.tar.gz) = abdd788b63f18eaeb77c4d49e63712530efd0859ed5715fbe3143df6b0874c33
+SIZE (fuzzel-1.8.0.tar.gz) = 424298