diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile
index 719111dd5bea..6078b9d80983 100644
--- a/sysutils/accountsservice/Makefile
+++ b/sysutils/accountsservice/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	accountsservice
 PORTVERSION=	0.6.55
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils devel
 MASTER_SITES=	http://www.freedesktop.org/software/${PORTNAME}/
 
 PATCH_SITES=	https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/-/commit/
 PATCHFILES+=	ac9b14f1c1bb.patch:-p1 # https://gitlab.freedesktop.org/accountsservice/accountsservice/-/merge_requests/82
 
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	D-Bus interface for user account query and manipulation
 WWW=		https://gitlab.freedesktop.org/accountsservice/accountsservice
 
 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_util.c b/sysutils/accountsservice/files/patch-src_util.c
new file mode 100644
index 000000000000..079b7ba75b4b
--- /dev/null
+++ b/sysutils/accountsservice/files/patch-src_util.c
@@ -0,0 +1,11 @@
+--- src/util.c.orig	2019-04-23 15:16:09 UTC
++++ src/util.c
+@@ -254,7 +254,7 @@ get_user_groups (const gchar  *user,
+         *groups = g_new (gid_t, ngroups);
+         res = getgrouplist (user, group, *groups, &ngroups);
+ 
+-        return res;
++        return res == 0 ? ngroups : res;
+ }
+ 
+