diff --git a/sysutils/cfengine-devel/Makefile b/sysutils/cfengine-devel/Makefile
index 7188bcf015d1..9dc588216177 100644
--- a/sysutils/cfengine-devel/Makefile
+++ b/sysutils/cfengine-devel/Makefile
@@ -5,9 +5,9 @@ PORTNAME=	cfengine
 PORTVERSION=	3.${CFENGINE_COMMIT_DATE}
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
-CFENGINE_HASH=		225c5e0cb
-LIBNTECH_HASH=		883eddc
-CFENGINE_COMMIT_DATE=	2021.03.19
+CFENGINE_HASH=		06665e776
+LIBNTECH_HASH=		73e7af1
+CFENGINE_COMMIT_DATE=	2021.03.29
 
 MAINTAINER=	cy@FreeBSD.org
 #		gjb@FreeBSD.org is also committer for this port
diff --git a/sysutils/cfengine-devel/distinfo b/sysutils/cfengine-devel/distinfo
index 44d1f17c4e41..1c181a33b158 100644
--- a/sysutils/cfengine-devel/distinfo
+++ b/sysutils/cfengine-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1616421513
-SHA256 (cfengine-core-3.2021.03.19-225c5e0cb_GH0.tar.gz) = dd0504d00ec9cb7c2e7fdd56a3caff032875986628fd36607778e1b94b31c777
-SIZE (cfengine-core-3.2021.03.19-225c5e0cb_GH0.tar.gz) = 2324207
-SHA256 (cfengine-libntech-883eddc_GH0.tar.gz) = f39b4a92dcb4f7f8f7094c82b5391fd0c532e1dc83147f7ec545f01c7d45a110
-SIZE (cfengine-libntech-883eddc_GH0.tar.gz) = 366867
+TIMESTAMP = 1617039280
+SHA256 (cfengine-core-3.2021.03.29-06665e776_GH0.tar.gz) = 0ca4cbce47fd94272de2bfdba2973326cfda862420caa832b321e7e10b26e8e9
+SIZE (cfengine-core-3.2021.03.29-06665e776_GH0.tar.gz) = 2331843
+SHA256 (cfengine-libntech-73e7af1_GH0.tar.gz) = 66ffd0ac420dbe0cbda69a32d58042d737408f07d405654d24dee8888bbf081b
+SIZE (cfengine-libntech-73e7af1_GH0.tar.gz) = 367080
diff --git a/sysutils/cfengine-masterfiles-devel/Makefile b/sysutils/cfengine-masterfiles-devel/Makefile
index 108d33bff966..514e799fc7f6 100644
--- a/sysutils/cfengine-masterfiles-devel/Makefile
+++ b/sysutils/cfengine-masterfiles-devel/Makefile
@@ -5,8 +5,8 @@ PORTNAME=	cfengine-masterfiles
 PORTVERSION=	3.${CFENGINE_COMMIT_DATE}
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
-HASH=		97a05348
-CFENGINE_COMMIT_DATE=	2021.03.17
+HASH=		e9b90067
+CFENGINE_COMMIT_DATE=	2021.03.29
 
 MAINTAINER=	cy@FreeBSD.org
 #		gjb@FreeBSD.org is also committer for this port
@@ -29,11 +29,13 @@ RUN_DEPENDS=	cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
 MAKE_JOBS_UNSAFE=	yes
-USES=		autoreconf:build cpe gmake python:build
+USES=		autoreconf:build cpe gmake python:build shebangfix
 HAS_CONFIGURE=	yes
 EXAMPLESDIR=	${PREFIX}/share/examples/cfengine-masterfiles
 CONFIGURE_SCRIPT=	./autogen.sh
 CONFIGURE_ARGS=	--prefix=${EXAMPLESDIR}
 CONFIGURE_ENV=	EXPLICIT_VERSION=${PORTVERSION}-${HASH}
 
+SHEBANG_FILES=	modules/packages/snap
+
 .include <bsd.port.mk>
diff --git a/sysutils/cfengine-masterfiles-devel/distinfo b/sysutils/cfengine-masterfiles-devel/distinfo
index decf5713ec2e..6f820fc8acf2 100644
--- a/sysutils/cfengine-masterfiles-devel/distinfo
+++ b/sysutils/cfengine-masterfiles-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616421644
-SHA256 (cfengine-masterfiles-3.2021.03.17-97a05348_GH0.tar.gz) = 7ebce2a800917c1006d9d9e50c1d3dceac5995c9d5185c0693ec7946213435de
-SIZE (cfengine-masterfiles-3.2021.03.17-97a05348_GH0.tar.gz) = 440286
+TIMESTAMP = 1617039343
+SHA256 (cfengine-masterfiles-3.2021.03.29-e9b90067_GH0.tar.gz) = 82705a56bb529816a77c7cd09ce2bd2a6603b2610633cf4c85164379dc181a17
+SIZE (cfengine-masterfiles-3.2021.03.29-e9b90067_GH0.tar.gz) = 440292