diff --git a/net/dhcpcd/Makefile b/net/dhcpcd/Makefile
index 42a40f5559ed..135ae9c094d5 100644
--- a/net/dhcpcd/Makefile
+++ b/net/dhcpcd/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	dhcpcd
-DISTVERSION=	9.4.1
-PORTREVISION=	2
+DISTVERSIONPREFIX=	${PORTNAME}-
+DISTVERSION=	9.5.0
 CATEGORIES=	net
-MASTER_SITES=	https://roy.marples.name/downloads/dhcpcd/
 
 MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	DHCP/IPv4LL/IPv6RS/DHCPv6 client
 WWW=		https://roy.marples.name/projects/dhcpcd
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		compiler:c11 cpe tar:xz
+USES=		compiler:c11 cpe
 CPE_VENDOR=	dhcpcd_project
+USE_GITHUB=	yes
+GH_ACCOUNT=	NetworkConfiguration
 USE_RC_SUBR=	dhcpcd
 
 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}/etc/dhcpcd.conf.sample
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/dhcpcd
 
 .include <bsd.port.mk>
diff --git a/net/dhcpcd/distinfo b/net/dhcpcd/distinfo
index d35b52df9df3..1dd239ea9881 100644
--- a/net/dhcpcd/distinfo
+++ b/net/dhcpcd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634928253
-SHA256 (dhcpcd-9.4.1.tar.xz) = 819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c
-SIZE (dhcpcd-9.4.1.tar.xz) = 257092
+TIMESTAMP = 1681235477
+SHA256 (NetworkConfiguration-dhcpcd-dhcpcd-9.5.0_GH0.tar.gz) = bb8ebda4b250ca8c2faa910205f5ffac66ae83a786b59f5cedbfe7624ad04bc2
+SIZE (NetworkConfiguration-dhcpcd-dhcpcd-9.5.0_GH0.tar.gz) = 348645