diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile
index d7b57124c667..1717fa4db052 100644
--- a/sysutils/accountsservice/Makefile
+++ b/sysutils/accountsservice/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	accountsservice
 PORTVERSION=	23.13.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils devel
 MASTER_SITES=	https://www.freedesktop.org/software/${PORTNAME}/
 
@@ -23,7 +23,6 @@ MESON_ARGS=	-Dconsolekit=true \
 		-Dgdmconffile=${LOCALBASE}/etc/gdm/custom.conf \
 		-Dlightdmconffile=${LOCALBASE}/etc/lightdm/lightdm.conf \
 		-Dsystemdsystemunitdir=no \
-		-Dvapi=false \
 		-Dtests=false
 
 USE_GITLAB=	yes
@@ -31,4 +30,11 @@ GL_SITE=	https://gitlab.freedesktop.org
 GL_ACCOUNT=	arrowd
 GL_TAGNAME=	665c4390164f47283f234970087105e52245ae67
 
+OPTIONS_DEFINE=		VAPI
+OPTIONS_DEFAULT=	VAPI
+OPTIONS_SUB=		yes
+
+VAPI_USES=		vala:build
+VAPI_MESON_TRUE=	vapi
+
 .include <bsd.port.mk>
diff --git a/sysutils/accountsservice/pkg-plist b/sysutils/accountsservice/pkg-plist
index fd029358fc1b..4b159291e445 100644
--- a/sysutils/accountsservice/pkg-plist
+++ b/sysutils/accountsservice/pkg-plist
@@ -90,6 +90,8 @@ share/locale/zh_CN/LC_MESSAGES/accounts-service.mo
 share/locale/zh_HK/LC_MESSAGES/accounts-service.mo
 share/locale/zh_TW/LC_MESSAGES/accounts-service.mo
 share/polkit-1/actions/org.freedesktop.accounts.policy
+%%VAPI%%share/vala/vapi/accountsservice.deps
+%%VAPI%%share/vala/vapi/accountsservice.vapi
 @dir(,,0775) /var/db/AccountsService/icons
 @dir(,,0700) /var/db/AccountsService/users
 @dir /var/db/AccountsService