--- net/chrony/Makefile	(revision 534287)
+++ net/chrony/Makefile	(working copy)
@@ -14,8 +14,6 @@ 
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cpe gmake libedit pkgconfig
-USERS=		chronyd
-GROUPS=		chronyd
 
 CPE_VENDOR=	tuxfamily
 HAS_CONFIGURE=	yes
@@ -24,7 +22,7 @@ 
 		--sysconfdir=${PREFIX}/etc --mandir=${MANPREFIX}/man \
 		--datarootdir=${DATADIR} --docdir=${DOCSDIR} \
 		--with-readline-library=${LOCALBASE}/lib \
-		--with-user=chronyd --without-tomcrypt
+		--without-tomcrypt
 USE_RC_SUBR=	chronyd
 
 ALL_TARGET=	all
@@ -35,8 +33,8 @@ 
 
 # XXX: there are also other potentially useful options worth looking into:
 #  --disable-pps        Disable PPS API support
-OPTIONS_DEFINE=		DOCS HTMLDOCS EXAMPLES IPV6 
-OPTIONS_DEFAULT=	NETTLE
+OPTIONS_DEFINE=		DOCS HTMLDOCS EXAMPLES IPV6 USER
+OPTIONS_DEFAULT=	NETTLE USER
 OPTIONS_RADIO=		CRYPTLIB
 OPTIONS_RADIO_CRYPTLIB=	NETTLE NSS
 HTMLDOCS_IMPLIES=	DOCS
@@ -45,6 +43,9 @@ 
 HTMLDOCS_DESC=		Build HTML docs (IMPLIES DOCS, needs ruby, asciidoctor)
 NETTLE_DESC=		Nettle crypto library support
 NSS_DESC=		NSS-based support for more hashing algorithms
+USER_DESC=		Run as user chronyd, group chronyd
+USER_CONFIGURE_OFF=	--with-user=ntpd
+USER_CONFIGURE_ON=	--with-user=chronyd
 
 IPV6_CONFIGURE_OFF=	--disable-ipv6
 NETTLE_CONFIGURE_OFF=	--without-nettle
@@ -52,6 +53,8 @@ 
 NSS_CONFIGURE_OFF=	--without-nss
 NSS_LIB_DEPENDS=	libfreebl3.so:security/nss
 
+USER_VARS=		USERS=chronyd GROUPS=chronyd
+
 HTMLDOCS_BUILD_DEPENDS+=asciidoctor:textproc/rubygem-asciidoctor
 HTMLDOCS_ALL_TARGET=	docs
 HTMLDOCS_INSTALL_TARGET=docs