diff --git a/sysutils/dunst/Makefile b/sysutils/dunst/Makefile
index 0d3d79494dad..073bf1c8bf10 100644
--- a/sysutils/dunst/Makefile
+++ b/sysutils/dunst/Makefile
@@ -1,69 +1,71 @@
 PORTNAME=	dunst
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.12.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	uzsolt@FreeBSD.org
 COMMENT=	Lightweight notification daemon
 WWW=		https://dunst-project.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libharfbuzz.so:print/harfbuzz
+# textproc/jq required by completions
+RUN_DEPENDS=	jq:textproc/jq
+TEST_DEPENDS=	bash:shells/bash \
+		valgrind:devel/valgrind
 
 USES=		gmake gnome perl5 pkgconfig xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dunst-project
 
 USE_GNOME=	cairo gdkpixbuf pango
 USE_PERL5=	build
 USE_XORG=	x11 xext xinerama xrandr xscrnsaver
 
-MAKE_ARGS=	MANPREFIX="${PREFIX}/share/man" SYSCONFDIR="${PREFIX}/etc" \
+MAKE_ARGS=	MANPREFIX="${PREFIX}/share/man" \
+		SYSCONFDIR="${PREFIX}/etc" \
 		SYSTEMD=0
+TEST_TARGET=	test
 
-OPTIONS_DEFINE=	DUNSTIFY WAYLAND
+OPTIONS_DEFINE=		DUNSTIFY WAYLAND
 OPTIONS_DEFAULT=	DUNSTIFY WAYLAND
+OPTIONS_SUB=		yes
 
 DUNSTIFY_DESC=	Install dunstify (alternative to the notify-send)
 
 DUNSTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
-DUNSTIFY_PLIST_FILES=	bin/dunstify
+DUNSTIFY_MAKE_ENV_OFF=	DUNSTIFY=0
 
 WAYLAND_CATEGORIES=	wayland
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
 WAYLAND_MAKE_ENV_OFF=	WAYLAND=0
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's,/usr/bin,${PREFIX}/bin,g' \
 		-e 's,/usr/share,${PREFIX}/share,g' \
 		-e 's,/etc,${PREFIX}&,g' \
 		${WRKSRC}/docs/dunst.?.pod \
 		${WRKSRC}/dunstrc \
 		${WRKSRC}/src/settings_data.h \
 		${WRKSRC}/src/icon-lookup.c
 
-post-patch-DUNSTIFY-off:
-	@${REINPLACE_CMD} -e '/^all:/s/dunstify//' \
-		 -e '/^install:/s/install-dunstify//' \
-		${WRKSRC}/Makefile
-	@${REINPLACE_CMD} '/libnotify/d' ${WRKSRC}/config.mk
-
 pre-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/dbus-1/services/
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/dunst
 	${MV} ${STAGEDIR}/${ETCDIR}/dunstrc ${STAGEDIR}/${ETCDIR}/dunstrc.sample
 
 post-install-DUNSTIFY-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/dunstify ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/sysutils/dunst/pkg-plist b/sysutils/dunst/pkg-plist
index a4c49e917358..77f179623987 100644
--- a/sysutils/dunst/pkg-plist
+++ b/sysutils/dunst/pkg-plist
@@ -1,15 +1,16 @@
 bin/dunst
 bin/dunstctl
+%%DUNSTIFY%%bin/dunstify
 @sample %%ETCDIR%%/dunstrc.sample
 share/bash-completion/completions/dunst
 share/bash-completion/completions/dunstctl
 share/dbus-1/services/org.knopwob.dunst.service
 share/fish/vendor_completions.d/dunst.fish
 share/fish/vendor_completions.d/dunstctl.fish
-share/fish/vendor_completions.d/dunstify.fish
+%%DUNSTIFY%%share/fish/vendor_completions.d/dunstify.fish
 share/man/man1/dunst.1.gz
 share/man/man1/dunstctl.1.gz
 share/man/man1/dunstify.1.gz
 share/man/man5/dunst.5.gz
 share/zsh/site-functions/_dunst
 share/zsh/site-functions/_dunstctl