diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile
index 36620618b8c6..65279cc3d5fc 100644
--- a/net/isc-dhcp31-server/Makefile
+++ b/net/isc-dhcp31-server/Makefile
@@ -7,22 +7,23 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.1.3
+PORTVERSION=	3.1.ESV
+PORTEPOCH=	1
 PORTREVISION=	${DHCP_PORTREVISION}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	dhcp dhcp/dhcp-3.1-history
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	31-${SUBSYS}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
+DISTNAME=	${PORTNAME}-3.1-ESV
 
 MAINTAINER=	jpaetzel@FreeBSD.org
 COMMENT?=	The ISC Dynamic Host Configuration Protocol server
 
-PORTREVISION_SERVER=	1
-PORTREVISION_CLIENT=	1
-PORTREVISION_RELAY=	1
-PORTREVISION_DEVEL=	1
+PORTREVISION_SERVER=	0
+PORTREVISION_CLIENT=	0
+PORTREVISION_RELAY=	0
+PORTREVISION_DEVEL=	0
 
 SUBSYS?=	server
 
diff --git a/net/isc-dhcp31-server/distinfo b/net/isc-dhcp31-server/distinfo
index 9f9d174a7bac..59b861c2b9a6 100644
--- a/net/isc-dhcp31-server/distinfo
+++ b/net/isc-dhcp31-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (dhcp-3.1.3.tar.gz) = 6ee8af8b283c95b3b4db5e88b6dd9a26
-SHA256 (dhcp-3.1.3.tar.gz) = cb363247a897beaf5708c98d3a80dba8edd8f639d6bd1f4ada6c5a64ba51e2d4
-SIZE (dhcp-3.1.3.tar.gz) = 804097
+MD5 (dhcp-3.1-ESV.tar.gz) = 13cb8884e16f26adf39d9210b25c79cd
+SHA256 (dhcp-3.1-ESV.tar.gz) = e316b7dc34f05e38724273a473f823719281f229a71a80bc358f8e74687fd7d7
+SIZE (dhcp-3.1-ESV.tar.gz) = 797454