diff --git a/net/ocserv/Makefile b/net/ocserv/Makefile
index 344daf1934fc..6e19298e9853 100644
--- a/net/ocserv/Makefile
+++ b/net/ocserv/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ocserv
 PORTVERSION=	0.11.7
+PORTREVISION=	1
 CATEGORIES=	net security
 MASTER_SITES=	ftp://ftp.infradead.org/pub/ocserv/
 
@@ -41,6 +42,8 @@ GROUPS=		_ocserv
 
 USE_RC_SUBR=	ocserv
 
+PLIST_SUB=	USERS="${USERS}" GROUPS="${GROUPS}"
+
 OPTIONS_DEFINE=		DOCS EXAMPLES GSSAPI
 
 PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
@@ -54,8 +57,8 @@ post-patch:
 	@${RM} ${WRKSRC}/doc/*.8
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/ocserv/
-	@${MKDIR} ${STAGEDIR}/var/run/ocserv/
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/ocserv
+	@${MKDIR} ${STAGEDIR}/var/run/ocserv
 	${INSTALL_DATA} ${FILESDIR}/ocserv.conf ${STAGEDIR}${PREFIX}/etc/ocserv/conf.sample
 
 post-install-DOCS-on:
diff --git a/net/ocserv/pkg-plist b/net/ocserv/pkg-plist
index f47bb5fad7f6..801193d58f53 100644
--- a/net/ocserv/pkg-plist
+++ b/net/ocserv/pkg-plist
@@ -6,4 +6,4 @@ man/man8/ocpasswd.8.gz
 man/man8/ocserv.8.gz
 @sample etc/ocserv/conf.sample
 sbin/ocserv
-@dir /var/run/ocserv
+@dir(%%USERS%%,%%GROUPS%%,750) /var/run/ocserv