diff --git a/net/dhcpcd/Makefile b/net/dhcpcd/Makefile
index 7afc86f15b6c..cf13b33cc4ad 100644
--- a/net/dhcpcd/Makefile
+++ b/net/dhcpcd/Makefile
@@ -1,29 +1,29 @@
 # Created by: Roy Marples <roy@marples.name>
 
 PORTNAME=	dhcpcd
 DISTVERSION=	9.4.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://roy.marples.name/downloads/dhcpcd/
 
 MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	DHCP/IPv4LL/IPv6RS/DHCPv6 client
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		compiler:c11 cpe tar:xz
 CPE_VENDOR=	dhcpcd_project
 USE_RC_SUBR=	dhcpcd
 
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/examples \
+		--prefix=${PREFIX} \
 		--privsepuser="_dhcp" \
 		--without-udev
 
 post-install:
-	${MV} ${STAGEDIR}${PREFIX}/etc/dhcpcd.conf \
-		${STAGEDIR}${PREFIX}/share/examples/dhcpcd
+	${MV} ${STAGEDIR}${PREFIX}/etc/dhcpcd.conf ${STAGEDIR}${PREFIX}/etc/dhcpcd.conf.sample
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/dhcpcd
-	${MKDIR} ${STAGEDIR}/var/db/dhcpcd
 
 .include <bsd.port.mk>
diff --git a/net/dhcpcd/pkg-plist b/net/dhcpcd/pkg-plist
index 891ce7fabc99..4a2505f079f2 100644
--- a/net/dhcpcd/pkg-plist
+++ b/net/dhcpcd/pkg-plist
@@ -1,15 +1,15 @@
 libexec/dhcpcd-hooks/01-test
 libexec/dhcpcd-hooks/20-resolv.conf
 libexec/dhcpcd-hooks/30-hostname
 libexec/dhcpcd-hooks/50-ntp.conf
 libexec/dhcpcd-run-hooks
-man/man5/dhcpcd.conf.5.gz
-man/man8/dhcpcd-run-hooks.8.gz
-man/man8/dhcpcd.8.gz
 sbin/dhcpcd
 %%EXAMPLESDIR%%/hooks/10-wpa_supplicant
 %%EXAMPLESDIR%%/hooks/15-timezone
 %%EXAMPLESDIR%%/hooks/29-lookup-hostname
 %%EXAMPLESDIR%%/hooks/50-ypbind
-@sample %%EXAMPLESDIR%%/dhcpcd.conf etc/dhcpcd.conf
+share/man/man5/dhcpcd.conf.5.gz
+share/man/man8/dhcpcd-run-hooks.8.gz
+share/man/man8/dhcpcd.8.gz
+@sample etc/dhcpcd.conf.sample
 @dir(_dhcp,_dhcp,) /var/db/dhcpcd