diff --git a/net/dhcpcd/Makefile b/net/dhcpcd/Makefile
index d72b38fa52b6..596504e3e5bc 100644
--- a/net/dhcpcd/Makefile
+++ b/net/dhcpcd/Makefile
@@ -2,19 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	dhcpcd
-PORTVERSION=	5.5.6
-PORTREVISION=	2
+PORTVERSION=	6.4.2
 CATEGORIES=	net
 MASTER_SITES=	http://roy.marples.name/downloads/dhcpcd/ \
 		LOCAL/delphij
 
 MAINTAINER=	roy@marples.name
-COMMENT=	DHCP client
+COMMENT=	DHCP/IPv4LL/IPv6RS/DHCPv6 client
 
+LICENSE=	BSD2CLAUSE
+
+USES=		tar:bzip2
 GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
 USE_RC_SUBR=	dhcpcd
 
-CONFIGURE_ARGS+= --mandir=${PREFIX}/man
-
 .include <bsd.port.mk>
diff --git a/net/dhcpcd/distinfo b/net/dhcpcd/distinfo
index 9daf04d3725c..4b54d80af760 100644
--- a/net/dhcpcd/distinfo
+++ b/net/dhcpcd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dhcpcd-5.5.6.tar.bz2) = 657f10dc7de48cba9f7170b593bf0e11987d06bd12378e3f4cd01b9e99b1e8e7
-SIZE (dhcpcd-5.5.6.tar.bz2) = 78185
+SHA256 (dhcpcd-6.4.2.tar.bz2) = eebb9f9e13b40d47efbb56d8568e54f640bee3337ba45b30b3e47db5b14220b7
+SIZE (dhcpcd-6.4.2.tar.bz2) = 149510
diff --git a/net/dhcpcd/files/patch-configure b/net/dhcpcd/files/patch-configure
deleted file mode 100644
index bd439dbe274b..000000000000
--- a/net/dhcpcd/files/patch-configure
+++ /dev/null
@@ -1,30 +0,0 @@
---- ./configure.orig	2012-03-28 03:26:20.000000000 -0700
-+++ ./configure	2013-10-28 22:31:50.000000000 -0700
-@@ -53,7 +53,7 @@
- 	--includedir) eval INCLUDEDIR="$INCLUDEDIR${INCLUDEDIR:+ }$var";;
- 	--datadir|--infodir) ;; # ignore autotools
- 	--disable-maintainer-mode|--disable-dependency-tracking) ;;
--	--help) echo "See the README file for available options"; exit 0;;
-+	--help|--version) echo "See the README file for available options"; exit 0;;
- 	*) echo "$0: WARNING: unknown option $opt" >&2;;
- 	esac
- done
-@@ -101,7 +101,8 @@
- CONFIG_MK=config.mk
- 
- if [ -z "$BUILD" ]; then
--	BUILD=`uname -m`-`uname -s | tr '[:upper:]' '[:lower:]'`
-+	# autoconf target triplet: cpu-vendor-os (where os = system or kernel-system)
-+	BUILD=`uname -m`-unknown-`uname -s | tr '[:upper:]' '[:lower:]'`
- fi
- if [ -z "$HOST" ]; then
- 	[ -z "$TARGET" ] && TARGET=$BUILD
-@@ -124,6 +125,8 @@
- 	# Derive OS from cpu-manufacturer-os-kernel
- 	CPU=${TARGET%%-*}
- 	REST=${TARGET#*-}
-+	VENDOR=${REST%%-*}
-+	REST=${REST#*-}
- 	if [ "$CPU" != "$REST" ]; then
- 		MANU=${REST%%-*}
- 		REST=${REST#*-}
diff --git a/net/dhcpcd/pkg-descr b/net/dhcpcd/pkg-descr
index 0c864797c8b8..4f5238541533 100644
--- a/net/dhcpcd/pkg-descr
+++ b/net/dhcpcd/pkg-descr
@@ -1,3 +1,5 @@
-dhcpcd is an RFC2131 compliant DHCP client.
+dhcpcd is a DHCP/IPv4LL/IPv6RS/DHCPv6 client.
+It can also act as a network manager, responding to new interfaces,
+listening for carrier up/down events and managing routes.
 
 WWW: http://roy.marples.name/dhcpcd
diff --git a/net/dhcpcd/pkg-plist b/net/dhcpcd/pkg-plist
index 56958b5284a1..ab46408a21c3 100644
--- a/net/dhcpcd/pkg-plist
+++ b/net/dhcpcd/pkg-plist
@@ -1,15 +1,17 @@
-etc/dhcpcd.conf
-sbin/dhcpcd
-libexec/dhcpcd-hooks/50-ypbind
-libexec/dhcpcd-hooks/10-mtu
-libexec/dhcpcd-hooks/20-resolv.conf
-libexec/dhcpcd-hooks/50-ntp.conf
-libexec/dhcpcd-hooks/02-dump
-libexec/dhcpcd-hooks/30-hostname
+%%ETCDIR%%.conf
 libexec/dhcpcd-hooks/01-test
+libexec/dhcpcd-hooks/02-dump
+libexec/dhcpcd-hooks/10-mtu
+libexec/dhcpcd-hooks/10-wpa_supplicant
+libexec/dhcpcd-hooks/15-timezone
+libexec/dhcpcd-hooks/20-resolv.conf
 libexec/dhcpcd-hooks/29-lookup-hostname
+libexec/dhcpcd-hooks/30-hostname
+libexec/dhcpcd-hooks/50-ntp.conf
+libexec/dhcpcd-hooks/50-ypbind
 libexec/dhcpcd-run-hooks
 man/man5/dhcpcd.conf.5.gz
 man/man8/dhcpcd-run-hooks.8.gz
 man/man8/dhcpcd.8.gz
+sbin/dhcpcd
 @dirrmtry libexec/dhcpcd-hooks