--- UIDs	(revision 492992)
+++ UIDs	(working copy)
@@ -549,7 +549,7 @@ 
 _tss:*:601:601:daemon:0:0:TrouSerS user:/var/empty:/usr/sbin/nologin
 _pkcs11:*:602:602:daemon:0:0:opencryptoki user:/var/empty:/usr/sbin/nologin
 _acme:*:603:603::0:0:ACME client user:/var/empty:/usr/sbin/nologin
-# free: 604
+_sks:*:604:604::0:0:sks-keyserver user:/var/empty:/usr/sbin/nologin
 # free: 605
 # free: 606
 # free: 607
--- GIDs	(revision 492992)
+++ GIDs	(working copy)
@@ -544,7 +544,7 @@ 
 _tss:*:601:
 _pkcs11:*:602:
 _acme:*:603:
-# free: 604
+_sks:*:604:
 # free: 605
 # free: 606
 # free: 607
--- security/sks/Makefile	(revision 492992)
+++ security/sks/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	sks
 PORTVERSION=	1.1.6
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://bitbucket.org/skskeyserver/sks-keyserver/downloads/
 
@@ -10,10 +11,11 @@ 
 
 LICENSE=	GPLv2+
 
+USES=		bdb:5 perl5 gmake shebangfix tar:tgz
 USE_OCAML=	yes
 USE_OCAML_CAMLP4=yes
-USES=		bdb:5 perl5 gmake shebangfix tar:tgz
 USE_PERL5=	build
+
 MAKE_JOBS_UNSAFE=yes
 SHEBANG_FILES=	sks_build.sh
 
@@ -24,6 +26,12 @@ 
 
 SUB_FILES=	pkg-message
 
+USE_RC_SUBR=	sks-db sks-recon
+PORTDOCS=	BUGS README.md TODO UPGRADING
+
+USERS=		_sks
+GROUPS=		_sks
+
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
@@ -40,10 +48,11 @@ 
 pre-build:
 	@cd ${WRKSRC} && test -f .depend || ${MAKE_CMD} dep
 
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
 post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} BUGS README.md TODO UPGRADING \
-		 ${STAGEDIR}${DOCSDIR}
 	@cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} sks sks_add_mail
 
 .include <bsd.port.mk>
--- security/sks/pkg-plist	(revision 492992)
+++ security/sks/pkg-plist	(working copy)
@@ -2,7 +2,3 @@ 
 bin/sks_add_mail
 bin/sks_build.sh
 man/man8/sks.8.gz
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADING