diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile
index 6892f96e8ef2..902a238bd200 100644
--- a/net/openntpd/Makefile
+++ b/net/openntpd/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	openntpd
 PORTVERSION=	4.6
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_OPENBSD}
@@ -30,7 +30,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ntpd ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/ntpd.conf.5 ${STAGEDIR}${PREFIX}/man/man5
 	${INSTALL_MAN} ${WRKSRC}/ntpd.8 ${STAGEDIR}${PREFIX}/man/man8
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${FILESDIR}/ntpd.conf ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${FILESDIR}/ntpd.conf \
+	    ${STAGEDIR}${PREFIX}/etc/ntpd.conf.sample
 
 .include <bsd.port.mk>
diff --git a/net/openntpd/files/openntpd.in b/net/openntpd/files/openntpd.in
index 51092c0dbca3..c6dfb9074c0e 100644
--- a/net/openntpd/files/openntpd.in
+++ b/net/openntpd/files/openntpd.in
@@ -15,6 +15,11 @@
 
 . /etc/rc.subr
 
+check_process()
+{
+        /bin/pgrep -f 'ntpd: \[priv\]'
+}
+
 name=openntpd
 rcvar=openntpd_enable
 
diff --git a/net/openntpd/pkg-plist b/net/openntpd/pkg-plist
index f0c06dcaef67..9c94ab37897c 100644
--- a/net/openntpd/pkg-plist
+++ b/net/openntpd/pkg-plist
@@ -1,7 +1,4 @@
+@sample etc/ntpd.conf.sample
 man/man5/ntpd.conf.5.gz
 man/man8/ntpd.8.gz
 sbin/ntpd
-@unexec if cmp -s %D/etc/ntpd.conf %D/%%EXAMPLESDIR%%/ntpd.conf; then rm -f %D/etc/ntpd.conf; fi
-%%EXAMPLESDIR%%/ntpd.conf
-@exec if [ ! -f %D/etc/ntpd.conf ]; then cp %D/%F %D/etc; fi
-@dirrm %%EXAMPLESDIR%%