diff --git a/net/isc-dhcp3-server/Makefile b/net/isc-dhcp3-server/Makefile
index 41050d125adb..a18d5a6c56db 100644
--- a/net/isc-dhcp3-server/Makefile
+++ b/net/isc-dhcp3-server/Makefile
@@ -7,17 +7,15 @@
 #
 
 PORTNAME=	isc-dhcp3
-PORTVERSION=	3.0.b1.14
+PORTVERSION=	3.0.b1.17
 CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.isc.org/isc/dhcp/
-DISTNAME=	dhcp-3.0b1pl14
+DISTNAME=	dhcp-3.0b1pl17
 
 MAINTAINER=	obrien@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/include/bind/res_update.h:${PORTSDIR}/net/bind8
 
-FORBIDDEN=	security hole found
-
 Y2K=		http://www.isc.org/y2k.html
 
 HAS_CONFIGURE=	yes
diff --git a/net/isc-dhcp3-server/distinfo b/net/isc-dhcp3-server/distinfo
index a15c0780251e..f0e647982b35 100644
--- a/net/isc-dhcp3-server/distinfo
+++ b/net/isc-dhcp3-server/distinfo
@@ -1 +1 @@
-MD5 (dhcp-3.0b1pl14.tar.gz) = 1a9ecd791209f0a21c85a344fa73b3f5
+MD5 (dhcp-3.0b1pl17.tar.gz) = 9e5202eefc133bd30a46882239123be4
diff --git a/net/isc-dhcp3-server/files/patch-clparse.c b/net/isc-dhcp3-server/files/patch-clparse.c
index 771afc5e0e5a..f2da52a15884 100644
--- a/net/isc-dhcp3-server/files/patch-clparse.c
+++ b/net/isc-dhcp3-server/files/patch-clparse.c
@@ -1,11 +1,5 @@
---- client/clparse.c.orig	Wed May 10 02:20:11 2000
-+++ client/clparse.c	Wed May 10 02:20:31 2000
-@@ -74,7 +74,7 @@
- 	top_level_config.backoff_cutoff = 15;
- 	top_level_config.initial_interval = 3;
- 	top_level_config.bootp_policy = P_ACCEPT;
--	top_level_config.script_name = "/etc/dhclient-script";
-+	top_level_config.script_name = CL_DEFAULT_SCRIPT_NAME;
- 	top_level_config.requested_options = default_requested_options;
- 
- 	top_level_config.on_receipt = new_group ("read_client_conf");
+--- client/clparse.c.orig	Wed Jul 19 21:13:10 2000
++++ client/clparse.c	Thu Jul 20 21:52:53 2000
+@@ -46 +46 @@
+-char client_script_name [] = "/etc/dhclient-script";
++char client_script_name [] = CL_DEFAULT_SCRIPT_NAME;
diff --git a/net/isc-dhcp3/Makefile b/net/isc-dhcp3/Makefile
index 41050d125adb..a18d5a6c56db 100644
--- a/net/isc-dhcp3/Makefile
+++ b/net/isc-dhcp3/Makefile
@@ -7,17 +7,15 @@
 #
 
 PORTNAME=	isc-dhcp3
-PORTVERSION=	3.0.b1.14
+PORTVERSION=	3.0.b1.17
 CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.isc.org/isc/dhcp/
-DISTNAME=	dhcp-3.0b1pl14
+DISTNAME=	dhcp-3.0b1pl17
 
 MAINTAINER=	obrien@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/include/bind/res_update.h:${PORTSDIR}/net/bind8
 
-FORBIDDEN=	security hole found
-
 Y2K=		http://www.isc.org/y2k.html
 
 HAS_CONFIGURE=	yes
diff --git a/net/isc-dhcp3/distinfo b/net/isc-dhcp3/distinfo
index a15c0780251e..f0e647982b35 100644
--- a/net/isc-dhcp3/distinfo
+++ b/net/isc-dhcp3/distinfo
@@ -1 +1 @@
-MD5 (dhcp-3.0b1pl14.tar.gz) = 1a9ecd791209f0a21c85a344fa73b3f5
+MD5 (dhcp-3.0b1pl17.tar.gz) = 9e5202eefc133bd30a46882239123be4
diff --git a/net/isc-dhcp3/files/patch-clparse.c b/net/isc-dhcp3/files/patch-clparse.c
index 771afc5e0e5a..f2da52a15884 100644
--- a/net/isc-dhcp3/files/patch-clparse.c
+++ b/net/isc-dhcp3/files/patch-clparse.c
@@ -1,11 +1,5 @@
---- client/clparse.c.orig	Wed May 10 02:20:11 2000
-+++ client/clparse.c	Wed May 10 02:20:31 2000
-@@ -74,7 +74,7 @@
- 	top_level_config.backoff_cutoff = 15;
- 	top_level_config.initial_interval = 3;
- 	top_level_config.bootp_policy = P_ACCEPT;
--	top_level_config.script_name = "/etc/dhclient-script";
-+	top_level_config.script_name = CL_DEFAULT_SCRIPT_NAME;
- 	top_level_config.requested_options = default_requested_options;
- 
- 	top_level_config.on_receipt = new_group ("read_client_conf");
+--- client/clparse.c.orig	Wed Jul 19 21:13:10 2000
++++ client/clparse.c	Thu Jul 20 21:52:53 2000
+@@ -46 +46 @@
+-char client_script_name [] = "/etc/dhclient-script";
++char client_script_name [] = CL_DEFAULT_SCRIPT_NAME;
diff --git a/net/isc-dhcp30-server/Makefile b/net/isc-dhcp30-server/Makefile
index 41050d125adb..a18d5a6c56db 100644
--- a/net/isc-dhcp30-server/Makefile
+++ b/net/isc-dhcp30-server/Makefile
@@ -7,17 +7,15 @@
 #
 
 PORTNAME=	isc-dhcp3
-PORTVERSION=	3.0.b1.14
+PORTVERSION=	3.0.b1.17
 CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.isc.org/isc/dhcp/
-DISTNAME=	dhcp-3.0b1pl14
+DISTNAME=	dhcp-3.0b1pl17
 
 MAINTAINER=	obrien@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/include/bind/res_update.h:${PORTSDIR}/net/bind8
 
-FORBIDDEN=	security hole found
-
 Y2K=		http://www.isc.org/y2k.html
 
 HAS_CONFIGURE=	yes
diff --git a/net/isc-dhcp30-server/distinfo b/net/isc-dhcp30-server/distinfo
index a15c0780251e..f0e647982b35 100644
--- a/net/isc-dhcp30-server/distinfo
+++ b/net/isc-dhcp30-server/distinfo
@@ -1 +1 @@
-MD5 (dhcp-3.0b1pl14.tar.gz) = 1a9ecd791209f0a21c85a344fa73b3f5
+MD5 (dhcp-3.0b1pl17.tar.gz) = 9e5202eefc133bd30a46882239123be4
diff --git a/net/isc-dhcp30-server/files/patch-clparse.c b/net/isc-dhcp30-server/files/patch-clparse.c
index 771afc5e0e5a..f2da52a15884 100644
--- a/net/isc-dhcp30-server/files/patch-clparse.c
+++ b/net/isc-dhcp30-server/files/patch-clparse.c
@@ -1,11 +1,5 @@
---- client/clparse.c.orig	Wed May 10 02:20:11 2000
-+++ client/clparse.c	Wed May 10 02:20:31 2000
-@@ -74,7 +74,7 @@
- 	top_level_config.backoff_cutoff = 15;
- 	top_level_config.initial_interval = 3;
- 	top_level_config.bootp_policy = P_ACCEPT;
--	top_level_config.script_name = "/etc/dhclient-script";
-+	top_level_config.script_name = CL_DEFAULT_SCRIPT_NAME;
- 	top_level_config.requested_options = default_requested_options;
- 
- 	top_level_config.on_receipt = new_group ("read_client_conf");
+--- client/clparse.c.orig	Wed Jul 19 21:13:10 2000
++++ client/clparse.c	Thu Jul 20 21:52:53 2000
+@@ -46 +46 @@
+-char client_script_name [] = "/etc/dhclient-script";
++char client_script_name [] = CL_DEFAULT_SCRIPT_NAME;
diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile
index 41050d125adb..a18d5a6c56db 100644
--- a/net/isc-dhcp31-server/Makefile
+++ b/net/isc-dhcp31-server/Makefile
@@ -7,17 +7,15 @@
 #
 
 PORTNAME=	isc-dhcp3
-PORTVERSION=	3.0.b1.14
+PORTVERSION=	3.0.b1.17
 CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.isc.org/isc/dhcp/
-DISTNAME=	dhcp-3.0b1pl14
+DISTNAME=	dhcp-3.0b1pl17
 
 MAINTAINER=	obrien@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/include/bind/res_update.h:${PORTSDIR}/net/bind8
 
-FORBIDDEN=	security hole found
-
 Y2K=		http://www.isc.org/y2k.html
 
 HAS_CONFIGURE=	yes
diff --git a/net/isc-dhcp31-server/distinfo b/net/isc-dhcp31-server/distinfo
index a15c0780251e..f0e647982b35 100644
--- a/net/isc-dhcp31-server/distinfo
+++ b/net/isc-dhcp31-server/distinfo
@@ -1 +1 @@
-MD5 (dhcp-3.0b1pl14.tar.gz) = 1a9ecd791209f0a21c85a344fa73b3f5
+MD5 (dhcp-3.0b1pl17.tar.gz) = 9e5202eefc133bd30a46882239123be4
diff --git a/net/isc-dhcp31-server/files/patch-clparse.c b/net/isc-dhcp31-server/files/patch-clparse.c
index 771afc5e0e5a..f2da52a15884 100644
--- a/net/isc-dhcp31-server/files/patch-clparse.c
+++ b/net/isc-dhcp31-server/files/patch-clparse.c
@@ -1,11 +1,5 @@
---- client/clparse.c.orig	Wed May 10 02:20:11 2000
-+++ client/clparse.c	Wed May 10 02:20:31 2000
-@@ -74,7 +74,7 @@
- 	top_level_config.backoff_cutoff = 15;
- 	top_level_config.initial_interval = 3;
- 	top_level_config.bootp_policy = P_ACCEPT;
--	top_level_config.script_name = "/etc/dhclient-script";
-+	top_level_config.script_name = CL_DEFAULT_SCRIPT_NAME;
- 	top_level_config.requested_options = default_requested_options;
- 
- 	top_level_config.on_receipt = new_group ("read_client_conf");
+--- client/clparse.c.orig	Wed Jul 19 21:13:10 2000
++++ client/clparse.c	Thu Jul 20 21:52:53 2000
+@@ -46 +46 @@
+-char client_script_name [] = "/etc/dhclient-script";
++char client_script_name [] = CL_DEFAULT_SCRIPT_NAME;
diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile
index 41050d125adb..a18d5a6c56db 100644
--- a/net/isc-dhcp40-server/Makefile
+++ b/net/isc-dhcp40-server/Makefile
@@ -7,17 +7,15 @@
 #
 
 PORTNAME=	isc-dhcp3
-PORTVERSION=	3.0.b1.14
+PORTVERSION=	3.0.b1.17
 CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.isc.org/isc/dhcp/
-DISTNAME=	dhcp-3.0b1pl14
+DISTNAME=	dhcp-3.0b1pl17
 
 MAINTAINER=	obrien@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/include/bind/res_update.h:${PORTSDIR}/net/bind8
 
-FORBIDDEN=	security hole found
-
 Y2K=		http://www.isc.org/y2k.html
 
 HAS_CONFIGURE=	yes
diff --git a/net/isc-dhcp40-server/distinfo b/net/isc-dhcp40-server/distinfo
index a15c0780251e..f0e647982b35 100644
--- a/net/isc-dhcp40-server/distinfo
+++ b/net/isc-dhcp40-server/distinfo
@@ -1 +1 @@
-MD5 (dhcp-3.0b1pl14.tar.gz) = 1a9ecd791209f0a21c85a344fa73b3f5
+MD5 (dhcp-3.0b1pl17.tar.gz) = 9e5202eefc133bd30a46882239123be4
diff --git a/net/isc-dhcp40-server/files/patch-clparse.c b/net/isc-dhcp40-server/files/patch-clparse.c
index 771afc5e0e5a..f2da52a15884 100644
--- a/net/isc-dhcp40-server/files/patch-clparse.c
+++ b/net/isc-dhcp40-server/files/patch-clparse.c
@@ -1,11 +1,5 @@
---- client/clparse.c.orig	Wed May 10 02:20:11 2000
-+++ client/clparse.c	Wed May 10 02:20:31 2000
-@@ -74,7 +74,7 @@
- 	top_level_config.backoff_cutoff = 15;
- 	top_level_config.initial_interval = 3;
- 	top_level_config.bootp_policy = P_ACCEPT;
--	top_level_config.script_name = "/etc/dhclient-script";
-+	top_level_config.script_name = CL_DEFAULT_SCRIPT_NAME;
- 	top_level_config.requested_options = default_requested_options;
- 
- 	top_level_config.on_receipt = new_group ("read_client_conf");
+--- client/clparse.c.orig	Wed Jul 19 21:13:10 2000
++++ client/clparse.c	Thu Jul 20 21:52:53 2000
+@@ -46 +46 @@
+-char client_script_name [] = "/etc/dhclient-script";
++char client_script_name [] = CL_DEFAULT_SCRIPT_NAME;