diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile
index f01b3a207c5a..2db63164d817 100644
--- a/sysutils/accountsservice/Makefile
+++ b/sysutils/accountsservice/Makefile
@@ -1,27 +1,28 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 
 PORTNAME=	accountsservice
 PORTVERSION=	0.6.55
+PORTREVISION=	1
 CATEGORIES=	sysutils devel
 MASTER_SITES=	http://www.freedesktop.org/software/${PORTNAME}/
 
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	D-Bus interface for user account query and manipulation
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	dbus>0:devel/dbus
 LIB_DEPENDS=	libpolkit-gobject-1.so:sysutils/polkit
 
 USES=		cpe gettext gnome localbase:ldflags meson pkgconfig tar:xz
 CPE_VENDOR=	freedesktop
 USE_GNOME=	glib20 intltool libxslt introspection:build
 USE_LDCONFIG=	yes
 MESON_ARGS=	-Delogind=false \
 		-Dgdmconffile=${LOCALBASE}/etc/gdm/custom.conf \
 		-Dlocalstatedir=/var \
 		-Dsystemd=false \
 		-Dsystemdsystemunitdir=no
 
 .include <bsd.port.mk>
diff --git a/sysutils/accountsservice/files/patch-src_libaccountsservice_act-user-manager.c b/sysutils/accountsservice/files/patch-src_libaccountsservice_act-user-manager.c
new file mode 100644
index 000000000000..9026883f2cc6
--- /dev/null
+++ b/sysutils/accountsservice/files/patch-src_libaccountsservice_act-user-manager.c
@@ -0,0 +1,24 @@
+Obtained from:
+	https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/sysutils/accountsservice/patches/patch-src_libaccountsservice_act-user-manager_c
+
+$OpenBSD: patch-src_libaccountsservice_act-user-manager_c,v 1.2 2021/08/30 19:15:24 ajacoutot Exp $
+
+REVERT: (breaks listing users in gdm and gnome-cc and unlocking screenshield)
+From c7fa612023a163e8b2352e1170c6df3fceb19b27 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Thu, 19 Jul 2018 13:14:09 -0400
+Subject: [PATCH] lib: don't set loaded state until seat is fetched
+
+Index: src/libaccountsservice/act-user-manager.c
+--- src/libaccountsservice/act-user-manager.c.orig
++++ src/libaccountsservice/act-user-manager.c
+@@ -2547,7 +2547,7 @@ maybe_set_is_loaded (ActUserManager *manager)
+         /* Don't set is_loaded yet unless the seat is already loaded enough
+          * or failed to load.
+          */
+-        if (priv->seat.state > ACT_USER_MANAGER_SEAT_STATE_GET_ID) {
++        if (priv->seat.state >= ACT_USER_MANAGER_SEAT_STATE_GET_ID) {
+                 g_debug ("ActUserManager: Seat loaded, so now setting loaded property");
+         } else if (priv->seat.state == ACT_USER_MANAGER_SEAT_STATE_UNLOADED) {
+                 g_debug ("ActUserManager: Seat wouldn't load, so giving up on it and setting loaded property");
+