diff --git a/sysutils/xntpd/Makefile b/sysutils/xntpd/Makefile
index bf1ad4d2e03..0ce520b541e 100644
--- a/sysutils/xntpd/Makefile
+++ b/sysutils/xntpd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2000/07/01 17:14:31 brad Exp $
+# $OpenBSD: Makefile,v 1.15 2000/08/05 02:06:44 brad Exp $
 
 DISTNAME=	xntp3-5.93e-export
 CATEGORIES=	sysutils
@@ -21,8 +21,8 @@ CONFIGURE_ARGS=	--enable-accurate-adjtime --disable-IRIG \
 		--bindir="${PREFIX}/sbin"
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ntp
-	@ln -sf xntpd ${PREFIX}/sbin/ntpd
-	@cd ${WRKSRC}/html; tar cf - . | (cd ${PREFIX}/share/doc/ntp; tar xfBp -)
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xntpd
+	@cd ${PREFIX}/sbin && ln -sf xntpd ntpd
+	@cd ${WRKSRC}/html; tar cf - . | (cd ${PREFIX}/share/doc/xntpd; tar xfBp -)
 
 .include <bsd.port.mk>
diff --git a/sysutils/xntpd/patches/patch-aa b/sysutils/xntpd/patches/patch-configure
similarity index 100%
rename from sysutils/xntpd/patches/patch-aa
rename to sysutils/xntpd/patches/patch-configure
diff --git a/sysutils/xntpd/pkg/PLIST b/sysutils/xntpd/pkg/PLIST
index 5c7d13ef624..16069d6f12e 100644
--- a/sysutils/xntpd/pkg/PLIST
+++ b/sysutils/xntpd/pkg/PLIST
@@ -1,97 +1,97 @@
-@comment $OpenBSD: PLIST,v 1.8 2000/07/01 17:14:32 brad Exp $
+@comment $OpenBSD: PLIST,v 1.9 2000/08/05 02:06:45 brad Exp $
 sbin/xntpd
 @comment ntpd, a symbolic link to xntpd, is known by rc.securelevel
 sbin/ntpd
 sbin/ntpdate
-sbin/xntpdc
 sbin/ntpq
 sbin/ntptime
 sbin/ntptrace
 sbin/tickadj
-share/doc/ntp/HTMLPrimer.html
-share/doc/ntp/accopt.html
-share/doc/ntp/authcert.html
-share/doc/ntp/authopt.html
-share/doc/ntp/authspeed.html
-share/doc/ntp/biblio.html
-share/doc/ntp/build.html
-share/doc/ntp/clockopt.html
-share/doc/ntp/config.html
-share/doc/ntp/confopt.html
-share/doc/ntp/copyright.html
-share/doc/ntp/copyright.html.orig
-share/doc/ntp/debug.html
-share/doc/ntp/driver1.html
-share/doc/ntp/driver10.html
-share/doc/ntp/driver11.html
-share/doc/ntp/driver12.html
-share/doc/ntp/driver18.html
-share/doc/ntp/driver19.html
-share/doc/ntp/driver2.html
-share/doc/ntp/driver20.html
-share/doc/ntp/driver22.html
-share/doc/ntp/driver23.html
-share/doc/ntp/driver24.html
-share/doc/ntp/driver26.html
-share/doc/ntp/driver27.html
-share/doc/ntp/driver28.html
-share/doc/ntp/driver3.html
-share/doc/ntp/driver4.html
-share/doc/ntp/driver5.html
-share/doc/ntp/driver6.html
-share/doc/ntp/driver7.html
-share/doc/ntp/driver8.html
-share/doc/ntp/driver9.html
-share/doc/ntp/gadget.html
-share/doc/ntp/hints.html
-share/doc/ntp/howto.html
-share/doc/ntp/index.html
-share/doc/ntp/irig.html
-share/doc/ntp/kern.html
-share/doc/ntp/kernpps.html
-share/doc/ntp/ldisc.html
-share/doc/ntp/md5cert.html
-share/doc/ntp/measure.html
-share/doc/ntp/miscopt.html
-share/doc/ntp/monopt.html
-share/doc/ntp/notes.html
-share/doc/ntp/ntpdate.html
-share/doc/ntp/ntpq.html
-share/doc/ntp/ntptime.html
-share/doc/ntp/ntptrace.html
-share/doc/ntp/parsedata.html
-share/doc/ntp/parsenew.html
-share/doc/ntp/patches.html
-share/doc/ntp/porting.html
-share/doc/ntp/pps.html
-share/doc/ntp/prefer.html
-share/doc/ntp/rdebug.html
-share/doc/ntp/refclock.html
-share/doc/ntp/release.html
-share/doc/ntp/tickadj.html
-share/doc/ntp/vxworks.html
-share/doc/ntp/xntpd.html
-share/doc/ntp/xntpdc.html
-share/doc/ntp/hints/CHANGES
-share/doc/ntp/hints/README
-share/doc/ntp/hints/TODO
-share/doc/ntp/hints/a-ux
-share/doc/ntp/hints/aix
-share/doc/ntp/hints/bsdi
-share/doc/ntp/hints/decosf1
-share/doc/ntp/hints/decosf2
-share/doc/ntp/hints/hpux
-share/doc/ntp/hints/linux
-share/doc/ntp/hints/notes-xntp-v3
-share/doc/ntp/hints/parse
-share/doc/ntp/hints/refclocks
-share/doc/ntp/hints/rs6000
-share/doc/ntp/hints/sgi
-share/doc/ntp/hints/solaris
-share/doc/ntp/hints/sun4
-share/doc/ntp/hints/svr4-dell
-share/doc/ntp/hints/svr4_package
-share/doc/ntp/hints/vxworks.html
-share/doc/ntp/hints/winnt
-@dirrm share/doc/ntp/hints
-@dirrm share/doc/ntp
+sbin/xntpdc
+share/doc/xntpd/HTMLPrimer.html
+share/doc/xntpd/accopt.html
+share/doc/xntpd/authcert.html
+share/doc/xntpd/authopt.html
+share/doc/xntpd/authspeed.html
+share/doc/xntpd/biblio.html
+share/doc/xntpd/build.html
+share/doc/xntpd/clockopt.html
+share/doc/xntpd/config.html
+share/doc/xntpd/confopt.html
+share/doc/xntpd/copyright.html
+share/doc/xntpd/copyright.html.orig
+share/doc/xntpd/debug.html
+share/doc/xntpd/driver1.html
+share/doc/xntpd/driver10.html
+share/doc/xntpd/driver11.html
+share/doc/xntpd/driver12.html
+share/doc/xntpd/driver18.html
+share/doc/xntpd/driver19.html
+share/doc/xntpd/driver2.html
+share/doc/xntpd/driver20.html
+share/doc/xntpd/driver22.html
+share/doc/xntpd/driver23.html
+share/doc/xntpd/driver24.html
+share/doc/xntpd/driver26.html
+share/doc/xntpd/driver27.html
+share/doc/xntpd/driver28.html
+share/doc/xntpd/driver3.html
+share/doc/xntpd/driver4.html
+share/doc/xntpd/driver5.html
+share/doc/xntpd/driver6.html
+share/doc/xntpd/driver7.html
+share/doc/xntpd/driver8.html
+share/doc/xntpd/driver9.html
+share/doc/xntpd/gadget.html
+share/doc/xntpd/hints.html
+share/doc/xntpd/howto.html
+share/doc/xntpd/index.html
+share/doc/xntpd/irig.html
+share/doc/xntpd/kern.html
+share/doc/xntpd/kernpps.html
+share/doc/xntpd/ldisc.html
+share/doc/xntpd/md5cert.html
+share/doc/xntpd/measure.html
+share/doc/xntpd/miscopt.html
+share/doc/xntpd/monopt.html
+share/doc/xntpd/notes.html
+share/doc/xntpd/ntpdate.html
+share/doc/xntpd/ntpq.html
+share/doc/xntpd/ntptime.html
+share/doc/xntpd/ntptrace.html
+share/doc/xntpd/parsedata.html
+share/doc/xntpd/parsenew.html
+share/doc/xntpd/patches.html
+share/doc/xntpd/porting.html
+share/doc/xntpd/pps.html
+share/doc/xntpd/prefer.html
+share/doc/xntpd/rdebug.html
+share/doc/xntpd/refclock.html
+share/doc/xntpd/release.html
+share/doc/xntpd/tickadj.html
+share/doc/xntpd/vxworks.html
+share/doc/xntpd/xntpd.html
+share/doc/xntpd/xntpdc.html
+share/doc/xntpd/hints/CHANGES
+share/doc/xntpd/hints/README
+share/doc/xntpd/hints/TODO
+share/doc/xntpd/hints/a-ux
+share/doc/xntpd/hints/aix
+share/doc/xntpd/hints/bsdi
+share/doc/xntpd/hints/decosf1
+share/doc/xntpd/hints/decosf2
+share/doc/xntpd/hints/hpux
+share/doc/xntpd/hints/linux
+share/doc/xntpd/hints/notes-xntp-v3
+share/doc/xntpd/hints/parse
+share/doc/xntpd/hints/refclocks
+share/doc/xntpd/hints/rs6000
+share/doc/xntpd/hints/sgi
+share/doc/xntpd/hints/solaris
+share/doc/xntpd/hints/sun4
+share/doc/xntpd/hints/svr4-dell
+share/doc/xntpd/hints/svr4_package
+share/doc/xntpd/hints/vxworks.html
+share/doc/xntpd/hints/winnt
+@dirrm share/doc/xntpd/hints
+@dirrm share/doc/xntpd