diff --git a/x11/swaylock-effects/Makefile b/x11/swaylock-effects/Makefile
index b7d6cd6e5d5c..571c15d732ac 100644
--- a/x11/swaylock-effects/Makefile
+++ b/x11/swaylock-effects/Makefile
@@ -1,21 +1,21 @@
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6.11
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-effects
 
 COMMENT=	Screen locker for Wayland with fancy effects
 WWW=		https://github.com/jirutka/swaylock-effects
 
 MASTERDIR=	${.CURDIR}/../swaylock
 DESCR=		${.CURDIR}/pkg-descr
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
 GH_ACCOUNT=	jirutka
 GH_PROJECT=	${PORTNAME}${PKGNAMESUFFIX}
 
 .if !exists(/usr/include/omp.h)
 # XXX ports/199603: LLVM openmp in base doesn't support armv6, armv7 yet
 USE_GCC=	yes
 .endif
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11/swaylock/Makefile b/x11/swaylock/Makefile
index aef0628feb1a..a14765f1b5b9 100644
--- a/x11/swaylock/Makefile
+++ b/x11/swaylock/Makefile
@@ -1,51 +1,48 @@
 PORTNAME=	swaylock
 DISTVERSIONPREFIX?=	v
 DISTVERSION?=	1.7.2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT?=	Screen locker for Wayland
 WWW?=		https://github.com/swaywm/swaylock
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	wayland-protocols>=1.25:graphics/wayland-protocols
 LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	unix-selfauth-helper>0:security/unix-selfauth-helper
 
 CONFLICTS_INSTALL=	${PORTNAME}-*
 
 USES=		compiler:c11 cpe gnome meson pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT?=	swaywm
 CPE_VENDOR=	swaywm
 USE_GNOME=	cairo pango
 PLIST_FILES=	bin/${PORTNAME} \
 		etc/pam.d/${PORTNAME} \
 		share/bash-completion/completions/${PORTNAME} \
 		share/fish/vendor_completions.d/${PORTNAME}.fish \
 		share/zsh/site-functions/_${PORTNAME}
 
 OPTIONS_DEFINE=	MANPAGES PIXBUF
 OPTIONS_DEFAULT=MANPAGES PIXBUF
 
 MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
 MANPAGES_MESON_ENABLED=	man-pages
 MANPAGES_PLIST_FILES=	man/man1/${PORTNAME}.1.gz
 
 PIXBUF_USE=		GNOME=gdkpixbuf2
 PIXBUF_MESON_ENABLED=	gdk-pixbuf
 
 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
-# Respect LOCALBASE for unix-selfauth-helper
-	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \
-		${WRKSRC}/pam/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/x11/swaylock/files/patch-pam_swaylock b/x11/swaylock/files/patch-pam_swaylock
index 19908bfed564..baff8e6b5776 100644
--- a/x11/swaylock/files/patch-pam_swaylock
+++ b/x11/swaylock/files/patch-pam_swaylock
@@ -1,19 +1,18 @@
 "login" has "auth sufficient pam_self.so" but a screen locker is
 supposed to ask for password regardless.
 
 pam_unix(8) requires root priveleges to access master.passwd(5),
 so try authenticating via setuid helper first.
 
 --- pam/swaylock.orig	2019-01-29 19:48:00 UTC
 +++ pam/swaylock
-@@ -1,6 +1,7 @@
+@@ -1,6 +1,6 @@
  #
 -# PAM configuration file for the swaylock screen locker. By default, it includes
 -# the 'login' configuration file (see /etc/pam.d/login)
 +# PAM configuration for the "swaylock" service. swaylock(1) only uses
 +# auth facilities.
  #
  
 -auth include login
-+auth sufficient pam_exec.so return_prog_exit_status expose_authtok /usr/local/libexec/unix-selfauth-helper
-+auth include system
++auth include unix-selfauth