diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
index 8cfe0e43a4f7..21e555847094 100644
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ntp
 PORTVERSION=	4.2.3p21
+PORTREVISION=	1
 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/ \
diff --git a/net/ntp-devel/files/patch-configure b/net/ntp-devel/files/patch-configure
index 0f7bcb551501..a29a9a80766d 100644
--- a/net/ntp-devel/files/patch-configure
+++ b/net/ntp-devel/files/patch-configure
@@ -1,8 +1,8 @@
---- configure	Tue Dec 18 19:27:28 2001
-+++ configure	Sat Dec 22 00:41:29 2001
-@@ -1276,6 +1276,11 @@
-  mips-sgi-irix*)
-     ans=yes
+--- configure.orig	Wed Jul 26 05:28:54 2006
++++ configure	Thu Oct  5 11:28:54 2006
+@@ -1676,6 +1676,11 @@
+       done
+     done
      ;;
 + i?86-*-freebsd[[123]].*)
 +    ;;
@@ -10,5 +10,15 @@
 +    ans=yes
 +    ;;
  esac
- ac_cv_var_no_parenb_ignpar=$ans])
- case "$ac_cv_var_no_parenb_ignpar" in
+ done
+ 
+@@ -49085,6 +49090,9 @@
+   ans=no
+     case "$host" in
+      *-*-linux*)
++        ans=yes
++        ;;
++     *-*-freebsd*)
+         ans=yes
+         ;;
+     esac
diff --git a/net/ntp-stable/Makefile b/net/ntp-stable/Makefile
index 9f297a7e3cbd..0907136b2cc8 100644
--- a/net/ntp-stable/Makefile
+++ b/net/ntp-stable/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ntp
 PORTVERSION=	4.2.2p3.r2
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.udel.edu/pub/ntp/ntp4/ntp-4.2/ \
 		http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \
diff --git a/net/ntp-stable/files/patch-configure b/net/ntp-stable/files/patch-configure
index 0f7bcb551501..1410edae1225 100644
--- a/net/ntp-stable/files/patch-configure
+++ b/net/ntp-stable/files/patch-configure
@@ -1,8 +1,8 @@
---- configure	Tue Dec 18 19:27:28 2001
-+++ configure	Sat Dec 22 00:41:29 2001
-@@ -1276,6 +1276,11 @@
-  mips-sgi-irix*)
-     ans=yes
+--- configure.orig	Wed Jul 26 04:09:23 2006
++++ configure	Thu Oct  5 11:28:58 2006
+@@ -1479,6 +1479,11 @@
+       done
+     done
      ;;
 + i?86-*-freebsd[[123]].*)
 +    ;;
@@ -10,5 +10,15 @@
 +    ans=yes
 +    ;;
  esac
- ac_cv_var_no_parenb_ignpar=$ans])
- case "$ac_cv_var_no_parenb_ignpar" in
+ done
+ 
+@@ -25409,6 +25414,9 @@
+   ans=no
+     case "$host" in
+      *-*-linux*)
++        ans=yes
++        ;;
++     *-*-freebsd*)
+         ans=yes
+         ;;
+     esac
diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index f8ad32e37d1d..831e99da3a1c 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	ntp
-PORTVERSION=	4.2.2
+PORTVERSION=	4.2.2p2
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.udel.edu/pub/ntp/ntp4/ntp-4.2/ \
 		http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \
@@ -35,6 +36,7 @@ CONFIGURE_ARGS+=	--with-openssl-incdir=${OPENSSLINC} \
 			--with-openssl-libdir=${OPENSSLLIB}
 PLIST_SUB+=		SSL=""
 .endif
+CONFIGURE_ARGS+=	--enable-ipv6
 
 MAN1=		sntp.1
 
diff --git a/net/ntp/distinfo b/net/ntp/distinfo
index 4285de1573a9..ec230456aa75 100644
--- a/net/ntp/distinfo
+++ b/net/ntp/distinfo
@@ -1,3 +1,3 @@
-MD5 (ntp-4.2.2.tar.gz) = 111d879acdcc955e60f527575ab0a71a
-SHA256 (ntp-4.2.2.tar.gz) = fb392fa5f1a753043981e661b09c6d0249050ff903078ed215a568952d76befc
-SIZE (ntp-4.2.2.tar.gz) = 2546027
+MD5 (ntp-4.2.2p2.tar.gz) = 5c6ca6fab651c9cb21754a6478b8650e
+SHA256 (ntp-4.2.2p2.tar.gz) = 38105050bd0c6852e5ce03ee541ac726e75a838fe4925df1a8d63c016e26c923
+SIZE (ntp-4.2.2p2.tar.gz) = 2563137
diff --git a/net/ntp/files/patch-configure b/net/ntp/files/patch-configure
index 0f7bcb551501..b384d9d4c4b8 100644
--- a/net/ntp/files/patch-configure
+++ b/net/ntp/files/patch-configure
@@ -1,8 +1,8 @@
---- configure	Tue Dec 18 19:27:28 2001
-+++ configure	Sat Dec 22 00:41:29 2001
-@@ -1276,6 +1276,11 @@
-  mips-sgi-irix*)
-     ans=yes
+--- configure.orig	Sun Jul  9 04:08:43 2006
++++ configure	Thu Oct  5 11:20:15 2006
+@@ -1479,6 +1479,11 @@
+       done
+     done
      ;;
 + i?86-*-freebsd[[123]].*)
 +    ;;
@@ -10,5 +10,15 @@
 +    ans=yes
 +    ;;
  esac
- ac_cv_var_no_parenb_ignpar=$ans])
- case "$ac_cv_var_no_parenb_ignpar" in
+ done
+ 
+@@ -25384,6 +25389,9 @@
+   ans=no
+     case "$host" in
+      *-*-linux*)
++        ans=yes
++        ;;
++    *-*-freebsd*)
+         ans=yes
+         ;;
+     esac