diff --git a/net/isc-dhcp3-server/Makefile b/net/isc-dhcp3-server/Makefile
index f7421f816aa4..67ad56bf4e6b 100644
--- a/net/isc-dhcp3-server/Makefile
+++ b/net/isc-dhcp3-server/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.5.r2
+PORTVERSION=	3.0.5
 PORTREVISION=	${DHCP_PORTREVISION}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_ISC}
diff --git a/net/isc-dhcp3-server/distinfo b/net/isc-dhcp3-server/distinfo
index 388f6940d23e..f30443e4ac05 100644
--- a/net/isc-dhcp3-server/distinfo
+++ b/net/isc-dhcp3-server/distinfo
@@ -1,9 +1,9 @@
-MD5 (dhcp-3.0.5rc2.tar.gz) = f14122e6b414f5881e6926aa5d88c56a
-SHA256 (dhcp-3.0.5rc2.tar.gz) = 01f66158315489084e349d92fbb390e0754eb9a094926d4a500b2d5804b1fad4
-SIZE (dhcp-3.0.5rc2.tar.gz) = 876507
-MD5 (dhcp-3.0.5rc2-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
-SHA256 (dhcp-3.0.5rc2-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
-SIZE (dhcp-3.0.5rc2-ldap-patch) = 285970
-MD5 (dhcp-3.0.5rc2-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
-SHA256 (dhcp-3.0.5rc2-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
-SIZE (dhcp-3.0.5rc2-dlq-patch) = 7655
+MD5 (dhcp-3.0.5.tar.gz) = ce5d30d4645e4eab1f54561b487d1ec7
+SHA256 (dhcp-3.0.5.tar.gz) = dd445fb2a341cdd69e85693dce6f8fda1a1c9d0e98d34c01afc3e68d8037ffb6
+SIZE (dhcp-3.0.5.tar.gz) = 876591
+MD5 (dhcp-3.0.5-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
+SHA256 (dhcp-3.0.5-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
+SIZE (dhcp-3.0.5-ldap-patch) = 285970
+MD5 (dhcp-3.0.5-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
+SHA256 (dhcp-3.0.5-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
+SIZE (dhcp-3.0.5-dlq-patch) = 7655
diff --git a/net/isc-dhcp30-server/Makefile b/net/isc-dhcp30-server/Makefile
index f7421f816aa4..67ad56bf4e6b 100644
--- a/net/isc-dhcp30-server/Makefile
+++ b/net/isc-dhcp30-server/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.5.r2
+PORTVERSION=	3.0.5
 PORTREVISION=	${DHCP_PORTREVISION}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_ISC}
diff --git a/net/isc-dhcp30-server/distinfo b/net/isc-dhcp30-server/distinfo
index 388f6940d23e..f30443e4ac05 100644
--- a/net/isc-dhcp30-server/distinfo
+++ b/net/isc-dhcp30-server/distinfo
@@ -1,9 +1,9 @@
-MD5 (dhcp-3.0.5rc2.tar.gz) = f14122e6b414f5881e6926aa5d88c56a
-SHA256 (dhcp-3.0.5rc2.tar.gz) = 01f66158315489084e349d92fbb390e0754eb9a094926d4a500b2d5804b1fad4
-SIZE (dhcp-3.0.5rc2.tar.gz) = 876507
-MD5 (dhcp-3.0.5rc2-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
-SHA256 (dhcp-3.0.5rc2-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
-SIZE (dhcp-3.0.5rc2-ldap-patch) = 285970
-MD5 (dhcp-3.0.5rc2-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
-SHA256 (dhcp-3.0.5rc2-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
-SIZE (dhcp-3.0.5rc2-dlq-patch) = 7655
+MD5 (dhcp-3.0.5.tar.gz) = ce5d30d4645e4eab1f54561b487d1ec7
+SHA256 (dhcp-3.0.5.tar.gz) = dd445fb2a341cdd69e85693dce6f8fda1a1c9d0e98d34c01afc3e68d8037ffb6
+SIZE (dhcp-3.0.5.tar.gz) = 876591
+MD5 (dhcp-3.0.5-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
+SHA256 (dhcp-3.0.5-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
+SIZE (dhcp-3.0.5-ldap-patch) = 285970
+MD5 (dhcp-3.0.5-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
+SHA256 (dhcp-3.0.5-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
+SIZE (dhcp-3.0.5-dlq-patch) = 7655
diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile
index f7421f816aa4..67ad56bf4e6b 100644
--- a/net/isc-dhcp31-server/Makefile
+++ b/net/isc-dhcp31-server/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.5.r2
+PORTVERSION=	3.0.5
 PORTREVISION=	${DHCP_PORTREVISION}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_ISC}
diff --git a/net/isc-dhcp31-server/distinfo b/net/isc-dhcp31-server/distinfo
index 388f6940d23e..f30443e4ac05 100644
--- a/net/isc-dhcp31-server/distinfo
+++ b/net/isc-dhcp31-server/distinfo
@@ -1,9 +1,9 @@
-MD5 (dhcp-3.0.5rc2.tar.gz) = f14122e6b414f5881e6926aa5d88c56a
-SHA256 (dhcp-3.0.5rc2.tar.gz) = 01f66158315489084e349d92fbb390e0754eb9a094926d4a500b2d5804b1fad4
-SIZE (dhcp-3.0.5rc2.tar.gz) = 876507
-MD5 (dhcp-3.0.5rc2-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
-SHA256 (dhcp-3.0.5rc2-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
-SIZE (dhcp-3.0.5rc2-ldap-patch) = 285970
-MD5 (dhcp-3.0.5rc2-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
-SHA256 (dhcp-3.0.5rc2-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
-SIZE (dhcp-3.0.5rc2-dlq-patch) = 7655
+MD5 (dhcp-3.0.5.tar.gz) = ce5d30d4645e4eab1f54561b487d1ec7
+SHA256 (dhcp-3.0.5.tar.gz) = dd445fb2a341cdd69e85693dce6f8fda1a1c9d0e98d34c01afc3e68d8037ffb6
+SIZE (dhcp-3.0.5.tar.gz) = 876591
+MD5 (dhcp-3.0.5-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
+SHA256 (dhcp-3.0.5-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
+SIZE (dhcp-3.0.5-ldap-patch) = 285970
+MD5 (dhcp-3.0.5-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
+SHA256 (dhcp-3.0.5-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
+SIZE (dhcp-3.0.5-dlq-patch) = 7655
diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile
index f7421f816aa4..67ad56bf4e6b 100644
--- a/net/isc-dhcp40-server/Makefile
+++ b/net/isc-dhcp40-server/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.5.r2
+PORTVERSION=	3.0.5
 PORTREVISION=	${DHCP_PORTREVISION}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_ISC}
diff --git a/net/isc-dhcp40-server/distinfo b/net/isc-dhcp40-server/distinfo
index 388f6940d23e..f30443e4ac05 100644
--- a/net/isc-dhcp40-server/distinfo
+++ b/net/isc-dhcp40-server/distinfo
@@ -1,9 +1,9 @@
-MD5 (dhcp-3.0.5rc2.tar.gz) = f14122e6b414f5881e6926aa5d88c56a
-SHA256 (dhcp-3.0.5rc2.tar.gz) = 01f66158315489084e349d92fbb390e0754eb9a094926d4a500b2d5804b1fad4
-SIZE (dhcp-3.0.5rc2.tar.gz) = 876507
-MD5 (dhcp-3.0.5rc2-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
-SHA256 (dhcp-3.0.5rc2-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
-SIZE (dhcp-3.0.5rc2-ldap-patch) = 285970
-MD5 (dhcp-3.0.5rc2-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
-SHA256 (dhcp-3.0.5rc2-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
-SIZE (dhcp-3.0.5rc2-dlq-patch) = 7655
+MD5 (dhcp-3.0.5.tar.gz) = ce5d30d4645e4eab1f54561b487d1ec7
+SHA256 (dhcp-3.0.5.tar.gz) = dd445fb2a341cdd69e85693dce6f8fda1a1c9d0e98d34c01afc3e68d8037ffb6
+SIZE (dhcp-3.0.5.tar.gz) = 876591
+MD5 (dhcp-3.0.5-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
+SHA256 (dhcp-3.0.5-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
+SIZE (dhcp-3.0.5-ldap-patch) = 285970
+MD5 (dhcp-3.0.5-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
+SHA256 (dhcp-3.0.5-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
+SIZE (dhcp-3.0.5-dlq-patch) = 7655