Index: GIDs
===================================================================
--- GIDs
+++ GIDs
@@ -790,7 +790,7 @@
 sogod:*:846:
 domoticz:*:847:
 graylog:*:848:
-# free: 849
+chronyd:*:849:
 # free: 850
 # free: 851
 # free: 852
Index: UIDs
===================================================================
--- UIDs
+++ UIDs
@@ -795,7 +795,7 @@
 sogod:*:846:846::0:0:SOGo groupware:/nonexistent:/usr/sbin/nologin
 domoticz:*:847:847::0:0:domoticz user:/nonexistent:/usr/sbin/nologin
 graylog:*:848:848::0:0:Graylog user:/nonexistent:/usr/sbin/nologin
-# free: 849
+chronyd:*:849:849::0:0:chronyd user:/nonexistent:/usr/sbin/nologin
 # free: 850
 # free: 851
 # free: 852
Index: net/chrony/Makefile
===================================================================
--- net/chrony/Makefile
+++ net/chrony/Makefile
@@ -12,23 +12,23 @@
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	rubygem-asciidoctor>=0:textproc/rubygem-asciidoctor
+USERS=		chronyd
+GROUPS=		chronyd
 
-USES=		cpe gmake makeinfo readline
+USES=		cpe gmake libedit
 CPE_VENDOR=	tuxfamily
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--chronyvardir=/var/db/${PORTNAME} \
 		--infodir=${PREFIX}/info \
 		--sysconfdir=${PREFIX}/etc --mandir=${MANPREFIX}/man \
-		--datarootdir=${DATADIR} --docdir=${DOCSDIR}
+		--datarootdir=${DATADIR} --docdir=${DOCSDIR} \
+		--with-user=chronyd
 USE_RC_SUBR=	chronyd
 
-ALL_TARGET=	all docs
-INSTALL_TARGET=	install install-docs
-EXTRAPORTDOCS=	FAQ NEWS README
-PORTDOCS=	chrony.conf.html chronyc.html chronyd.html faq.html \
-		installation.html ${EXTRAPORTDOCS}
+ALL_TARGET=	all
+INSTALL_TARGET=	install
+PORTDOCS=	FAQ NEWS README
 PORTEXAMPLES=	chrony.conf.example1 chrony.conf.example2 \
 		chrony.conf.example3 chrony.keys.example
 
@@ -46,7 +46,8 @@
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chronyc
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/chronyd
-	${INSTALL_DATA} ${EXTRAPORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/examples/,} \
 		${STAGEDIR}${EXAMPLESDIR}
Index: net/chrony/pkg-message
===================================================================
--- net/chrony/pkg-message
+++ net/chrony/pkg-message
@@ -1,5 +1,4 @@
 Unfortunately, this software has shameful history of several vulnerabilities
 previously discovered.  FreeBSD Project cannot guarantee that this spree had
-come to an end.  It is further complicated, as chronyd(8) requires superuser
-permissions to operate; please type ``make deinstall'' to deinstall the port
+come to an end.  Please type ``make deinstall'' to deinstall the port
 if tight security is a concern.
Index: net/chrony/pkg-plist
===================================================================
--- net/chrony/pkg-plist
+++ net/chrony/pkg-plist
@@ -4,4 +4,6 @@
 man/man5/chrony.conf.5.gz
 man/man8/chronyd.8.gz
 sbin/chronyd
+@owner chronyd
+@group chronyd
 @dir /var/db/chrony