diff --git a/net/dhcpcd/Makefile b/net/dhcpcd/Makefile
index 744e540e21ca..e614cb1d93ab 100644
--- a/net/dhcpcd/Makefile
+++ b/net/dhcpcd/Makefile
@@ -1,33 +1,31 @@
 # Created by: Roy Marples <roy@marples.name>
 
 PORTNAME=	dhcpcd
-PORTVERSION=	9.4.0
-PORTREVISION=	1	
+DISTVERSION=	9.4.1
 CATEGORIES=	net
-MASTER_SITES=	https://roy.marples.name/downloads/dhcpcd/ \
-		https://cflags.cc/roy/dhcpcd/
+MASTER_SITES=	https://roy.marples.name/downloads/dhcpcd/
 
 MAINTAINER=	driesm.michiels@gmail.com
 COMMENT=	DHCP/IPv4LL/IPv6RS/DHCPv6 client
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-CONFLICTS_INSTALL=	dhcpcd-devel
-
 USES=		compiler:c11 cpe tar:xz
-
 CPE_VENDOR=	dhcpcd_project
+USE_RC_SUBR=	dhcpcd
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/examples \
 		--privsepuser="_dhcp" \
 		--without-udev
-USE_RC_SUBR=	dhcpcd
+
+CONFLICTS_INSTALL=	dhcpcd-devel
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/etc/dhcpcd.conf \
 		${STAGEDIR}${PREFIX}/share/examples/dhcpcd
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/dhcpcd
 	${MKDIR} ${STAGEDIR}/var/db/dhcpcd
 
 .include <bsd.port.mk>
diff --git a/net/dhcpcd/distinfo b/net/dhcpcd/distinfo
index c86edfb5895a..d35b52df9df3 100644
--- a/net/dhcpcd/distinfo
+++ b/net/dhcpcd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1609632418
-SHA256 (dhcpcd-9.4.0.tar.xz) = 41a69297f380bf15ee8f94f73154f8c2bca7157a087c0d5aca8de000ba1d4513
-SIZE (dhcpcd-9.4.0.tar.xz) = 256440
+TIMESTAMP = 1634928253
+SHA256 (dhcpcd-9.4.1.tar.xz) = 819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c
+SIZE (dhcpcd-9.4.1.tar.xz) = 257092
diff --git a/net/dhcpcd/files/patch-hooks_Makefile b/net/dhcpcd/files/patch-hooks_Makefile
deleted file mode 100644
index 7416f5dbe6ca..000000000000
--- a/net/dhcpcd/files/patch-hooks_Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- hooks/Makefile.orig	2020-12-28 12:59:20 UTC
-+++ hooks/Makefile
-@@ -1,4 +1,4 @@
--TOP?=	../
-+TOP=	../
- include ${TOP}/iconfig.mk
- 
- PROG=		dhcpcd-run-hooks
diff --git a/net/dhcpcd/files/patch-src_Makefile b/net/dhcpcd/files/patch-src_Makefile
deleted file mode 100644
index 35217a33629b..000000000000
--- a/net/dhcpcd/files/patch-src_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.orig	2021-09-10 17:26:01 UTC
-+++ src/Makefile
-@@ -8,7 +8,7 @@ SRCS+=		dhcp-common.c script.c
- CFLAGS?=	-O2
- SUBDIRS+=	${MKDIRS}
- 
--TOP?=		..
-+TOP=		..
- include ${TOP}/iconfig.mk
- 
- CSTD?=		c99
diff --git a/net/dhcpcd/files/patch-src_dev_Makefile b/net/dhcpcd/files/patch-src_dev_Makefile
deleted file mode 100644
index a171fdc5358c..000000000000
--- a/net/dhcpcd/files/patch-src_dev_Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/dev/Makefile.orig	2020-12-28 12:59:20 UTC
-+++ src/dev/Makefile
-@@ -1,4 +1,4 @@
--TOP?=	../../
-+TOP=	../../
- include ${TOP}/Makefile.inc
- include ${TOP}/config.mk
- 
diff --git a/net/dhcpcd/files/patch-tests_crypt_Makefile b/net/dhcpcd/files/patch-tests_crypt_Makefile
deleted file mode 100644
index 1f19ccea56b9..000000000000
--- a/net/dhcpcd/files/patch-tests_crypt_Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- tests/crypt/Makefile.orig	2020-12-28 12:59:20 UTC
-+++ tests/crypt/Makefile
-@@ -1,4 +1,4 @@
--TOP?=	../..
-+TOP=	../..
- include ${TOP}/iconfig.mk
- 
- PROG=		run-test
diff --git a/net/dhcpcd/files/patch-tests_eloop-bench_Makefile b/net/dhcpcd/files/patch-tests_eloop-bench_Makefile
deleted file mode 100644
index 7e5cb9ac750a..000000000000
--- a/net/dhcpcd/files/patch-tests_eloop-bench_Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- tests/eloop-bench/Makefile.orig	2020-12-28 12:59:20 UTC
-+++ tests/eloop-bench/Makefile
-@@ -1,4 +1,4 @@
--TOP?=	../..
-+TOP=	../..
- include ${TOP}/iconfig.mk
- 
- PROG=		eloop-bench