diff --git a/x11/lightdm/Makefile b/x11/lightdm/Makefile
index f182a07e3f6a..a1bef078c1a5 100644
--- a/x11/lightdm/Makefile
+++ b/x11/lightdm/Makefile
@@ -1,70 +1,71 @@
 PORTNAME=	lightdm
 PORTVERSION=	1.32.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	https://github.com/canonical/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Lightweight Display Manager
 WWW=		https://github.com/canonical/lightdm
 
 # library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
 LICENSE=	LGPL20 LGPL3 GPLv3
 LICENSE_COMB=	multi
 LICENSE_FILE_LGPL20=	${WRKSRC}/COPYING.LGPL2
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LGPL3
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING.GPL3
 
 BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libaccountsservice.so:sysutils/accountsservice \
 		libck-connector.so:sysutils/consolekit2 \
 		libgcrypt.so:security/libgcrypt \
 		libxklavier.so:x11/libxklavier
 
 USES=		compiler:c++11-lang cpe gettext gmake gnome libtool localbase \
 		pathfix pkgconfig tar:xz xorg
 CPE_VENDOR=	${PORTNAME}_project
 USE_CXXSTD=	c++11
 USE_GNOME=	glib20 intltool
 USE_XORG=	x11 xcb xdmcp
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	lightdm
 
 CONFLICTS_INSTALL=	sddm
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-tests # PAM errors
 INSTALL_TARGET=	install-strip
 USERS=		lightdm
 GROUPS=		lightdm video
 PORTSCOUT=	limitw:1,even
 SUB_FILES=	Xsession
 
 OPTIONS_DEFINE=	DOCS VAPI
 OPTIONS_DEFAULT=VAPI
 OPTIONS_SUB=	yes
 
 DOCS_BUILD_DEPENDS=	gtkdoc-check:textproc/gtk-doc
 DOCS_CONFIGURE_ENABLE=	gtk-doc
 
 VAPI_USES=		vala:build
 VAPI_CONFIGURE_ENABLE=	vala
 VAPI_USE=		gnome=introspection:build
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \
 		${WRKSRC}/data/lightdm.conf
 
 post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/etc/init
 	${INSTALL_SCRIPT} ${WRKDIR}/Xsession ${STAGEDIR}${PREFIX}/etc/lightdm/
 	${MV} ${STAGEDIR}${PREFIX}/etc/lightdm/keys.conf ${STAGEDIR}${PREFIX}/etc/lightdm/keys.conf.sample
 	${MV} ${STAGEDIR}${PREFIX}/etc/lightdm/lightdm.conf ${STAGEDIR}${PREFIX}/etc/lightdm/lightdm.conf.sample
 	${MV} ${STAGEDIR}${PREFIX}/etc/lightdm/users.conf ${STAGEDIR}${PREFIX}/etc/lightdm/users.conf.sample
 	${MKDIR} ${STAGEDIR}/var/cache/lightdm \
 		${STAGEDIR}/var/log/lightdm \
 		${STAGEDIR}/var/run/lightdm
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/xgreeters
 	@(cd ${STAGEDIR}${PREFIX}/share/xgreeters && \
 		${LN} -sf lightdm-gtk-greeter.desktop default.desktop)
 
 .include <bsd.port.mk>
diff --git a/x11/lightdm/files/patch-data_pam_lightdm-autologin b/x11/lightdm/files/patch-data_pam_lightdm-autologin
index e2dba909866b..a6eb4874c705 100644
--- a/x11/lightdm/files/patch-data_pam_lightdm-autologin
+++ b/x11/lightdm/files/patch-data_pam_lightdm-autologin
@@ -1,27 +1,29 @@
---- data/pam/lightdm-autologin.orig	2015-08-09 23:30:00 UTC
+--- data/pam/lightdm-autologin.orig	2022-07-04 03:28:22 UTC
 +++ data/pam/lightdm-autologin
-@@ -1,20 +1,19 @@
+@@ -1,22 +1,18 @@
  #%PAM-1.0
- 
+-# Block login if shell in nologin or false
+-auth      required pam_succeed_if.so shell notin /sbin/nologin:/usr/sbin/nologin:/bin/false:/usr/bin/false
+-
  # Block login if they are globally disabled
 -auth      required pam_nologin.so
 +account      required pam_nologin.so
  
  # Load environment from /etc/environment and ~/.pam_environment
 -auth      required pam_env.so
 +#auth      required pam_env.so
  
  # Allow access without authentication
  auth      required pam_permit.so
  
  # Stop autologin if account requires action
 -account   required pam_unix.so
 +account   required pam_unix.so        no_warn try_first_pass
  
  # Can't change password
  password  required pam_deny.so
  
  # Setup session
 -session   required pam_unix.so
 -session   optional pam_systemd.so
 +session   required pam_permit.so