diff --git a/net/isc-dhcp/Makefile b/net/isc-dhcp/Makefile
index 5e2be3a2e66..1c73f49d854 100644
--- a/net/isc-dhcp/Makefile
+++ b/net/isc-dhcp/Makefile
@@ -1,15 +1,14 @@
-# $OpenBSD: Makefile,v 1.29 2012/10/31 23:21:05 brad Exp $
+# $OpenBSD: Makefile,v 1.30 2013/03/07 18:59:35 brad Exp $
 
 COMMENT-main=	ISC DHCP Server
 COMMENT-client=	ISC DHCP Client
 COMMENT-omapi=	ISC DHCP OMAPI
 
-VERSION=	4.2.4-P2
+VERSION=	4.2.5
 DISTNAME=	isc-dhcp-${VERSION}
 PKGNAME=	isc-dhcp-${VERSION:S/-P/./}
 PKGNAME-main=	isc-dhcp-server-${VERSION:S/-P/./}
 PKGNAME-client=	isc-dhcp-client-${VERSION:S/-P/./}
-REVISION-client= 0
 PKGNAME-omapi=	isc-dhcp-omapi-${VERSION:S/-P/./}
 CATEGORIES=	net
 
@@ -46,7 +45,9 @@ EXAMPLEDIR=		share/examples/isc-dhcp
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${EXAMPLEDIR}
 	${INSTALL_PROGRAM} ${FILESDIR}/dhclient-script ${PREFIX}/sbin
-	${INSTALL_DATA} ${WRKSRC}/server/dhcpd.conf ${PREFIX}/${EXAMPLEDIR}
-	${INSTALL_DATA} ${WRKSRC}/client/dhclient.conf ${PREFIX}/${EXAMPLEDIR}
+	${INSTALL_DATA} ${WRKSRC}/server/dhcpd.conf.example \
+	    ${PREFIX}/${EXAMPLEDIR}/dhcpd.conf
+	${INSTALL_DATA} ${WRKSRC}/client/dhclient.conf.example \
+	    ${PREFIX}/${EXAMPLEDIR}/dhclient.conf
 
 .include <bsd.port.mk>
diff --git a/net/isc-dhcp/distinfo b/net/isc-dhcp/distinfo
index 9a86839c880..294dd43df73 100644
--- a/net/isc-dhcp/distinfo
+++ b/net/isc-dhcp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dhcp-4.2.4-P2.tar.gz) = D3UXDjI82Vc+bgml2SNnJfPlbjysWnCgH+Kp12tDZJk=
-SIZE (dhcp-4.2.4-P2.tar.gz) = 8190209
+SHA256 (dhcp-4.2.5.tar.gz) = dxpc/7H9E5LSWSbiLhxYoAbirQLs130TYJbl42altrw=
+SIZE (dhcp-4.2.5.tar.gz) = 8258824
diff --git a/net/isc-dhcp/patches/patch-client_Makefile_in b/net/isc-dhcp/patches/patch-client_Makefile_in
index 0f5a19d38fe..e281835c70e 100644
--- a/net/isc-dhcp/patches/patch-client_Makefile_in
+++ b/net/isc-dhcp/patches/patch-client_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-client_Makefile_in,v 1.1 2012/10/31 23:21:05 brad Exp $
---- client/Makefile.in.orig	Wed Oct 31 11:27:18 2012
-+++ client/Makefile.in	Wed Oct 31 11:27:35 2012
-@@ -552,7 +552,8 @@ uninstall-man: uninstall-man5 uninstall-man8
+$OpenBSD: patch-client_Makefile_in,v 1.2 2013/03/07 18:59:35 brad Exp $
+--- client/Makefile.in.orig	Wed Jan  2 19:02:24 2013
++++ client/Makefile.in	Sun Feb 24 23:40:23 2013
+@@ -554,7 +554,8 @@ uninstall-man: uninstall-man5 uninstall-man8
  
  dhclient.o: dhclient.c
  	$(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
diff --git a/net/isc-dhcp/patches/patch-server_dhcpd_c b/net/isc-dhcp/patches/patch-server_dhcpd_c
index 4b345251987..85a700ac745 100644
--- a/net/isc-dhcp/patches/patch-server_dhcpd_c
+++ b/net/isc-dhcp/patches/patch-server_dhcpd_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-server_dhcpd_c,v 1.1 2012/01/14 12:43:25 sthen Exp $
---- server/dhcpd.c.orig	Thu Apr 21 10:08:15 2011
-+++ server/dhcpd.c	Fri Dec 23 14:14:41 2011
-@@ -705,6 +705,12 @@ main(int argc, char **argv) {
+$OpenBSD: patch-server_dhcpd_c,v 1.2 2013/03/07 18:59:35 brad Exp $
+--- server/dhcpd.c.orig	Wed Jan  2 19:05:16 2013
++++ server/dhcpd.c	Sun Feb 24 23:40:23 2013
+@@ -707,6 +707,12 @@ main(int argc, char **argv) {
  	if (lftest)
  		exit (0);