diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
index 27153dfa3685..0df2ee39376a 100644
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ntp
-PORTVERSION=	4.2.7p304
+PORTVERSION=	4.2.7p357
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.udel.edu/pub/ntp/ntp4/ntp-dev/ \
 		http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ \
@@ -50,7 +50,9 @@ CONFIGURE_ARGS+=	--enable-ntp-signd
 
 .if defined(WITH_NTPSNMPD)
 PLIST_FILES+=		sbin/ntpsnmpd
+MAN8+=			ntpsnmpd.8
 BUILD_DEPENDS+=		${LOCALBASE}/include/net-snmp/net-snmp-config.h:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS=		netsnmp:${PORTSDIR}/net-mgmt/net-snmp
 RUN_DEPENDS+=		${LOCALBASE}/include/net-snmp/net-snmp-config.h:${PORTSDIR}/net-mgmt/net-snmp
 .else
 CONFIGURE_ARGS+=	--without-ntpsnmpd
@@ -75,17 +77,6 @@ pre-everything::
 	@${ECHO} building and installing this port.
 	@${ECHO}
 
-.if exists(${LOCALBASE}/bin/net-snmp-config)
-# NTP autodects net-snmp and if found builds and installs a binary that
-# uses it. If detected, modify dependencies and package list.
-BUILD_DEPENDS=	${LOCALBASE}/bin/net-snmp-config:${PORTSDIR}/net-mgmt/net-snmp
-LIB_DEPENDS=	netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
-PLIST_SUB+=	NETSNMP=""
-MAN8+=		ntpsnmpd.8
-.else
-PLIST_SUB+=	NETSNMP="@comment "
-.endif
-
 AUTOTOOLSFILES=	aclocal.m4
 
 post-patch:
diff --git a/net/ntp-devel/distinfo b/net/ntp-devel/distinfo
index 1a252ddaaa7f..60d6d3822d59 100644
--- a/net/ntp-devel/distinfo
+++ b/net/ntp-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ntp-dev-4.2.7p304.tar.gz) = 931e5f136c3e3f911d9b4dac3dd183b4bfe52d1965d9bf39f186e9ad6ad490cb
-SIZE (ntp-dev-4.2.7p304.tar.gz) = 5926991
+SHA256 (ntp-dev-4.2.7p357.tar.gz) = fd7cdc1ed8d10494beefb884602252fe6aa656b427a9c623b4e1cc9e2bb4aef4
+SIZE (ntp-dev-4.2.7p357.tar.gz) = 6313538
diff --git a/net/ntp-devel/files/patch-include-ntpd.h b/net/ntp-devel/files/patch-include-ntpd.h
new file mode 100644
index 000000000000..51a4910ed72a
--- /dev/null
+++ b/net/ntp-devel/files/patch-include-ntpd.h
@@ -0,0 +1,11 @@
+--- include/ntpd.h.orig	2013-01-27 18:29:10.000000000 -0800
++++ include/ntpd.h	2013-02-26 21:53:41.000000000 -0800
+@@ -523,7 +523,7 @@
+ 
+ /* ntp_signd.c */
+ #ifdef HAVE_NTP_SIGND
+-extern void send_via_ntp_signd(struct recvbuf, int, keyid_t, int, 
++extern void send_via_ntp_signd(struct recvbuf *, int, keyid_t, int, 
+ 			       struct pkt *);
+ #endif
+ 
diff --git a/net/ntp-devel/pkg-plist b/net/ntp-devel/pkg-plist
index fa8413604a11..13f94fa6accc 100644
--- a/net/ntp-devel/pkg-plist
+++ b/net/ntp-devel/pkg-plist
@@ -102,6 +102,234 @@ sbin/sntp
 %%PORTDOCS%%%%DOCSDIR%%/hints/winnt.html
 %%PORTDOCS%%%%DOCSDIR%%/history.html
 %%PORTDOCS%%%%DOCSDIR%%/howto.html
+%%PORTDOCS%%%%DOCSDIR%%/html/access.html
+%%PORTDOCS%%%%DOCSDIR%%/html/accopt.html
+%%PORTDOCS%%%%DOCSDIR%%/html/assoc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/audio.html
+%%PORTDOCS%%%%DOCSDIR%%/html/authentic.html
+%%PORTDOCS%%%%DOCSDIR%%/html/authopt.html
+%%PORTDOCS%%%%DOCSDIR%%/html/autokey.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bugs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/build.html
+%%PORTDOCS%%%%DOCSDIR%%/html/clock.html
+%%PORTDOCS%%%%DOCSDIR%%/html/clockopt.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cluster.html
+%%PORTDOCS%%%%DOCSDIR%%/html/comdex.html
+%%PORTDOCS%%%%DOCSDIR%%/html/config.html
+%%PORTDOCS%%%%DOCSDIR%%/html/confopt.html
+%%PORTDOCS%%%%DOCSDIR%%/html/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/html/debug.html
+%%PORTDOCS%%%%DOCSDIR%%/html/decode.html
+%%PORTDOCS%%%%DOCSDIR%%/html/discipline.html
+%%PORTDOCS%%%%DOCSDIR%%/html/discover.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver10.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver11.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver12.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver16.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver18.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver19.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver20.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver22.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver26.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver27.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver28.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver29.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver30.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver31.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver32.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver33.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver34.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver35.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver36.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver37.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver38.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver39.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver40.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver42.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver43.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver44.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver45.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver5.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver6.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver8.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver9.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/icons/home.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/icons/mail2.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/mx4200data.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/oncore-shmem.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/scripts/footer.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/scripts/style.css
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/tf582_4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/extern.html
+%%PORTDOCS%%%%DOCSDIR%%/html/filter.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hints.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/a-ux
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/aix
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/bsdi
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/changes
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/decosf1
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/decosf2
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/freebsd
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/hpux
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/linux
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/mpeix
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/notes-xntp-v3
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/parse
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/refclocks
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/rs6000
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/sco.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/sgi
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/solaris-dosynctodr.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/solaris.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/solaris.xtra.4023118
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/solaris.xtra.4095849
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/solaris.xtra.S99ntpd
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/solaris.xtra.patchfreq
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/sun4
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/svr4-dell
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/svr4_package
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/todo
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/vxworks.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/winnt.html
+%%PORTDOCS%%%%DOCSDIR%%/html/history.html
+%%PORTDOCS%%%%DOCSDIR%%/html/howto.html
+%%PORTDOCS%%%%DOCSDIR%%/html/huffpuff.html
+%%PORTDOCS%%%%DOCSDIR%%/html/icons/home.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/icons/mail2.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/icons/sitemap.png
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/kern.html
+%%PORTDOCS%%%%DOCSDIR%%/html/kernpps.html
+%%PORTDOCS%%%%DOCSDIR%%/html/keygen.html
+%%PORTDOCS%%%%DOCSDIR%%/html/leap.html
+%%PORTDOCS%%%%DOCSDIR%%/html/miscopt.html
+%%PORTDOCS%%%%DOCSDIR%%/html/monopt.html
+%%PORTDOCS%%%%DOCSDIR%%/html/msyslog.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ntp-wait.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ntp_conf.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ntpd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ntpdate.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ntpdc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ntpdsim.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ntpdsim_new.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ntpq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ntptime.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ntptrace.html
+%%PORTDOCS%%%%DOCSDIR%%/html/orphan.html
+%%PORTDOCS%%%%DOCSDIR%%/html/parsedata.html
+%%PORTDOCS%%%%DOCSDIR%%/html/parsenew.html
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/9400n.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice11.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice13.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice15.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice23.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice31.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice32.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice35.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice38.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice44.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice47.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice51.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice61.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/barnstable.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/beaver.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/boom3.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/boom3a.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/boom4.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/broad.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/bustardfly.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/c51.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/description.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/discipline.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/dogsnake.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/driver29.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/driver43_1.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/driver43_2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/fg6021.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/fg6039.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/fig_3_1.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/flatheads.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/flt1.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/flt2.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/flt3.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/flt4.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/flt5.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/flt6.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/flt7.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/flt8.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/flt9.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/freq1211.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/gadget.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/gps167.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/group.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/hornraba.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/igclock.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/neoclock4x.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/offset1211.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/oncore_evalbig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/oncore_remoteant.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/oncore_utplusbig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/oz2.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/panda.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pd_om006.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pd_om011.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/peer.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pogo.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pogo1a.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pogo3a.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pogo4.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pogo5.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pogo6.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pogo7.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pogo8.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pzf509.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pzf511.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/rabbit.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/radio2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/sheepb.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/stack1a.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/sx5.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/thunderbolt.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/tonea.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/tribeb.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/wingdorothy.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/poll.html
+%%PORTDOCS%%%%DOCSDIR%%/html/pps.html
+%%PORTDOCS%%%%DOCSDIR%%/html/prefer.html
+%%PORTDOCS%%%%DOCSDIR%%/html/quick.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rate.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rdebug.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refclock.html
+%%PORTDOCS%%%%DOCSDIR%%/html/release.html
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/accopt.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/audio.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/authopt.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/clockopt.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/command.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/config.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/confopt.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/external.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/footer.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/hand.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/install.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/manual.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/misc.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/miscopt.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/monopt.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/refclock.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/special.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/style.css
+%%PORTDOCS%%%%DOCSDIR%%/html/select.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sitemap.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sntp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/stats.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tickadj.html
+%%PORTDOCS%%%%DOCSDIR%%/html/warp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/xleave.html
 %%PORTDOCS%%%%DOCSDIR%%/huffpuff.html
 %%PORTDOCS%%%%DOCSDIR%%/icons/home.gif
 %%PORTDOCS%%%%DOCSDIR%%/icons/mail2.gif
@@ -114,6 +342,10 @@ sbin/sntp
 %%PORTDOCS%%%%DOCSDIR%%/miscopt.html
 %%PORTDOCS%%%%DOCSDIR%%/monopt.html
 %%PORTDOCS%%%%DOCSDIR%%/msyslog.html
+%%PORTDOCS%%%%DOCSDIR%%/ntp-keygen.html
+%%PORTDOCS%%%%DOCSDIR%%/ntp-wait.html
+%%PORTDOCS%%%%DOCSDIR%%/ntp.conf.html
+%%PORTDOCS%%%%DOCSDIR%%/ntp.keys.html
 %%PORTDOCS%%%%DOCSDIR%%/ntp_conf.html
 %%PORTDOCS%%%%DOCSDIR%%/ntpd.html
 %%PORTDOCS%%%%DOCSDIR%%/ntpdate.html
@@ -121,9 +353,9 @@ sbin/sntp
 %%PORTDOCS%%%%DOCSDIR%%/ntpdsim.html
 %%PORTDOCS%%%%DOCSDIR%%/ntpdsim_new.html
 %%PORTDOCS%%%%DOCSDIR%%/ntpq.html
+%%PORTDOCS%%%%DOCSDIR%%/ntpsnmpd.html
 %%PORTDOCS%%%%DOCSDIR%%/ntptime.html
 %%PORTDOCS%%%%DOCSDIR%%/ntptrace.html
-%%PORTDOCS%%%%DOCSDIR%%/ntp-wait.html
 %%PORTDOCS%%%%DOCSDIR%%/orphan.html
 %%PORTDOCS%%%%DOCSDIR%%/parsedata.html
 %%PORTDOCS%%%%DOCSDIR%%/parsenew.html
@@ -231,6 +463,7 @@ sbin/sntp
 %%PORTDOCS%%%%DOCSDIR%%/select.html
 %%PORTDOCS%%%%DOCSDIR%%/sitemap.html
 %%PORTDOCS%%%%DOCSDIR%%/sntp.html
+%%PORTDOCS%%%%DOCSDIR%%/stats.html
 %%PORTDOCS%%%%DOCSDIR%%/tickadj.html
 %%PORTDOCS%%%%DOCSDIR%%/warp.html
 %%PORTDOCS%%%%DOCSDIR%%/xleave.html
@@ -245,6 +478,14 @@ sbin/sntp
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/scripts
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/pic
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/icons
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/scripts
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/pic
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/icons
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/hints
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/drivers/scripts
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/drivers/icons
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/drivers
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/hints
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/drivers/scripts
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/drivers/icons