diff --git a/net/isc-dhcp42-server/Makefile b/net/isc-dhcp42-server/Makefile
index 57374d949473..ecdc788172b0 100644
--- a/net/isc-dhcp42-server/Makefile
+++ b/net/isc-dhcp42-server/Makefile
@@ -2,14 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	dhcp
-DISTVERSION=	4.2.5
+DISTVERSION=	4.2.6
 PORTREVISION=	${DHCP_PORTREVISION}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR=	${PORTNAME}/${DISTVERSION}-${PATCHLEVEL}
+MASTER_SITE_SUBDIR=	${PORTNAME}/${DISTVERSION}
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	42-${SUBSYS}
-DISTNAME=	${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}
+#DISTNAME=	${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT?=	The ISC Dynamic Host Configuration Protocol server
@@ -24,7 +24,7 @@ PORTREVISION_CLIENT=	0
 PORTREVISION_RELAY=	0
 
 SUBSYS?=	server
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}
+#WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}
 
 UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
@@ -41,14 +41,15 @@ BIND_SYMBOLS_DESC=	Enable BIND internal symbol table
 
 # PORTREVISION and CONFLICTS handling
 .if ${SUBSYS} == client
-CONFLICTS=	isc-dhcp3?-client-[0-9]* isc-dhcp41-client-[0-9]*
+CONFLICTS=	isc-dhcp3?-client-[0-9]* isc-dhcp4[13]-client-[0-9]*
 DHCP_PORTREVISION=	${PORTREVISION_CLIENT}
 .elif ${SUBSYS} == relay
-CONFLICTS=	isc-dhcp3?-relay-[0-9]* isc-dhcp41-relay-[0-9]*
+CONFLICTS=	isc-dhcp3?-relay-[0-9]* isc-dhcp4[13]-relay-[0-9]*
 DHCP_PORTREVISION=	${PORTREVISION_RELAY}
 .else
-CONFLICTS=	isc-dhcp3?-server-[0-9]* isc-dhcp41-server-[0-9]*
+CONFLICTS=	isc-dhcp3?-server-[0-9]* isc-dhcp4[13]-server-[0-9]*
 DHCP_PORTREVISION=	${PORTREVISION_SERVER}
+MAKE_JOBS_UNSAFE=	yes
 .endif
 
 .if ${SUBSYS} == server
diff --git a/net/isc-dhcp42-server/distinfo b/net/isc-dhcp42-server/distinfo
index 3bb412cb89f8..5a6be4fede42 100644
--- a/net/isc-dhcp42-server/distinfo
+++ b/net/isc-dhcp42-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dhcp-4.2.5-P1.tar.gz) = 59b06c9f5d775e46999b422c45b9229402c462b114ce1685617bfb2b8b028250
-SIZE (dhcp-4.2.5-P1.tar.gz) = 8255960
+SHA256 (dhcp-4.2.6.tar.gz) = ab3aaab3c938a1c0e44fd75ee4d51682d35eb8328e991006cc6ee17514bfe291
+SIZE (dhcp-4.2.6.tar.gz) = 8935311