diff --git a/x11-wm/hikari/Makefile b/x11-wm/hikari/Makefile
index 782bd3a62968..0077486cb809 100644
--- a/x11-wm/hikari/Makefile
+++ b/x11-wm/hikari/Makefile
@@ -1,52 +1,53 @@
 PORTNAME=	hikari
 DISTVERSION=	2.3.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm wayland
 MASTER_SITES=	https://hikari.acmelabs.space/releases/
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Stacking Wayland compositor with tiling capabilities
 WWW=		https://hikari.acmelabs.space
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>=1.14:graphics/wayland-protocols \
 		wlroots>=0.15.0<0.16.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libinput.so:x11/libinput \
 		libucl.so:textproc/libucl \
 		libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libxkbcommon.so:x11/libxkbcommon
+RUN_DEPENDS=	unix-selfauth-helper>0:security/unix-selfauth-helper
 
 USES=		compiler:c11 gnome pkgconfig xorg
 USE_GNOME=	cairo pango
 USE_XORG=	pixman
 
 MAKE_ARGS+=	${WITH_DEBUG:DDEBUG=YES}
 
 OPTIONS_DEFINE=		GAMMA LAYERSHELL SCREENCOPY VIRTUALINPUT X11
 OPTIONS_DEFAULT=	GAMMA LAYERSHELL SCREENCOPY VIRTUALINPUT X11
 
 GAMMA_DESC=		Include gammacontrol protocol (required by, e.g., Redshift)
 LAYERSHELL_DESC=	Include layer_shell protocol (required by, e.g., waybar)
 SCREENCOPY_DESC=	Include screenshot protocol (required by, e.g., grim)
 VIRTUALINPUT_DESC=	needed for VNC support (requiered by e.g. wayvnc)
 
 GAMMA_MAKE_ARGS=	WITH_GAMMACONTROL=YES
 LAYERSHELL_MAKE_ARGS=	WITH_LAYERSHELL=YES
 SCREENCOPY_MAKE_ARGS=	WITH_SCREENCOPY=YES
 VIRTUALINPUT_MAKE_ARGS=	WITH_VIRTUAL_INPUT=YES
 X11_MAKE_ARGS=		WITH_XWAYLAND=YES
 
 post-install:
 .ifndef WITH_DEBUG
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/hikari
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/hikari-unlocker
 .endif
 	${MV} ${STAGEDIR}${ETCDIR}/hikari.conf \
 		${STAGEDIR}${ETCDIR}/hikari.conf.sample
 
 .include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk"
 .include <bsd.port.mk>
diff --git a/x11-wm/hikari/files/patch-etc_pam.d_hikari-unlocker.FreeBSD b/x11-wm/hikari/files/patch-etc_pam.d_hikari-unlocker.FreeBSD
new file mode 100644
index 000000000000..3b2fdc56f0f9
--- /dev/null
+++ b/x11-wm/hikari/files/patch-etc_pam.d_hikari-unlocker.FreeBSD
@@ -0,0 +1,8 @@
+pam_unix(8) requires root priveleges to access master.passwd(5),
+so try authenticating via setuid helper first.
+
+--- etc/pam.d/hikari-unlocker.FreeBSD.orig	2020-03-05 21:52:17 UTC
++++ etc/pam.d/hikari-unlocker.FreeBSD
+@@ -1 +1 @@
+-auth include passwd
++auth include unix-selfauth
diff --git a/x11-wm/hikari/pkg-plist b/x11-wm/hikari/pkg-plist
index db696af0e930..20d253a8166b 100644
--- a/x11-wm/hikari/pkg-plist
+++ b/x11-wm/hikari/pkg-plist
@@ -1,7 +1,7 @@
 bin/hikari
-@(,,4755) bin/hikari-unlocker
+bin/hikari-unlocker
 etc/pam.d/hikari-unlocker
 @sample %%ETCDIR%%/hikari.conf.sample
 share/backgrounds/hikari/hikari_wallpaper.png
 share/man/man1/hikari.1.gz
 share/wayland-sessions/hikari.desktop