diff --git a/security/afl++/Makefile b/security/afl++/Makefile
index 820fcdfbfb23..dd12980653bb 100644
--- a/security/afl++/Makefile
+++ b/security/afl++/Makefile
@@ -1,80 +1,81 @@
 # Created by: Fabian Keil <fk@fabiankeil.de>
 
 PORTNAME=	afl
-PORTVERSION=	3.14c
+PORTVERSION=	4.00c
 CATEGORIES=	security
 PKGNAMESUFFIX=	++-${FLAVOR}
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Fast instrumented fuzzer
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	uses x86-only instrumentation or requires complete LLVM support
 
 BUILD_DEPENDS=	ginstall:sysutils/coreutils
 
 FLAVORS=	llvm gcc
 FLAVOR?=	${FLAVORS:[1]}
 
 _LLVM_VER=		13
 llvm_BUILD_DEPENDS=	clang${_LLVM_VER}:devel/llvm${_LLVM_VER}
 llvm_RUN_DEPENDS=	clang${_LLVM_VER}:devel/llvm${_LLVM_VER}
 
-USES=		gmake tar:tgz
+USES=		gmake shebangfix tar:tgz
 .if ${FLAVOR} == gcc
 USE_GCC=	yes
 .endif
 USE_GITHUB=	yes
 GH_ACCOUNT=	AFLplusplus
 GH_PROJECT=	AFLplusplus
+SHEBANG_FILES=	afl-persistent-config
 
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	${${ARCH} != amd64 && ${ARCH} != i386:?AFL_NO_X86=1:} \
 		PREFIX="${PREFIX}/${PKGBASE}"
 .if ${FLAVOR} == llvm
 MAKE_ARGS+=	CC=clang${_LLVM_VER} \
 		CXX=clang++${_LLVM_VER} \
 		LLVM_CONFIG=llvm-config${_LLVM_VER}
 .endif
 ALL_TARGET=	distrib
 QA_ENV=		IGNORE_QA_stripped=1 # unstripped to keep it functional
 
 DOCSDIR=	${PREFIX}/${PKGBASE}/share/doc/afl
 MANDIRS=	${PREFIX}/${PKGBASE}/share/man/man8
 BINARY_ALIAS=	install=ginstall
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		DEBUG DOCS PYTHON
 OPTIONS_DEFAULT=	PYTHON
 
 PYTHON_DESC=	Python mutators support
 
 PYTHON_USES=		gettext-runtime python
 PYTHON_BINARY_ALIAS=	python3-config=${PYTHON_CMD}-config \
 			python3=${PYTHON_CMD}
 
 post-patch:
 	@${REINPLACE_CMD} '/alt_cc/ s,"gcc","gcc${GCC_DEFAULT:S/-devel$//}",' \
 		${WRKSRC}/src/afl-cc.c
 .if ${FLAVOR} == gcc
 	@${REINPLACE_CMD} 's@\(  as_params\[0\] = afl_as ? afl_as : \)\(.*\)@\1(u8*)"${LOCALBASE}/bin/as";@' \
 		${WRKSRC}/src/afl-as.c
 .elif ${FLAVOR} == llvm
 	@${ECHO_CMD} "all:" >${WRKSRC}/GNUmakefile.gcc_plugin
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/man.d
 	@${ECHO_CMD} "MANPATH ${PREFIX}/${PKGBASE}/share/man" >${STAGEDIR}${PREFIX}/etc/man.d/${PKGBASE}.conf
 	@${ECHO_CMD} "etc/man.d/${PKGBASE}.conf" >>${TMPPLIST}
 	@cd ${STAGEDIR}${PREFIX}; \
 		${FIND} ${PKGBASE} -not -path '${PKGBASE}/share/doc/*' -and \( -type f -or -type l \) | \
 		${SED} -Ee 's,^afl\+\+-${FLAVOR}/share/man/.*,&.gz,' \
 			-e 's,^.*/afl-${${FLAVOR} == gcc:?(clang|llvm):(gcc|g\+\+)}.*,@comment &,'  | \
 		${SORT} >> ${TMPPLIST}
 	@${CAT} ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/security/afl++/distinfo b/security/afl++/distinfo
index a1f2af361248..0e0082ca0397 100644
--- a/security/afl++/distinfo
+++ b/security/afl++/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633793558
-SHA256 (AFLplusplus-AFLplusplus-3.14c_GH0.tar.gz) = 36552e3aac5c390dfec4f75d0dd60dc802c3e97b8baf042aa1edb6529dba0766
-SIZE (AFLplusplus-AFLplusplus-3.14c_GH0.tar.gz) = 2162934
+TIMESTAMP = 1643193215
+SHA256 (AFLplusplus-AFLplusplus-4.00c_GH0.tar.gz) = f427294ed674e37d34a1b756a2190de17937e046ef21abb3ae37bba018a760f1
+SIZE (AFLplusplus-AFLplusplus-4.00c_GH0.tar.gz) = 2805041
diff --git a/security/afl++/files/patch-src_afl-cc.c b/security/afl++/files/patch-src_afl-cc.c
deleted file mode 100644
index 58c9e8e9403f..000000000000
--- a/security/afl++/files/patch-src_afl-cc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/afl-cc.c.orig	2021-10-09 18:30:48 UTC
-+++ src/afl-cc.c
-@@ -395,7 +395,7 @@ static void edit_params(u32 argc, char **argv, char **
-           snprintf(llvm_fullpath, sizeof(llvm_fullpath), "%s/clang",
-                    LLVM_BINDIR);
-         else
--          snprintf(llvm_fullpath, sizeof(llvm_fullpath), CLANGPP_BIN);
-+          snprintf(llvm_fullpath, sizeof(llvm_fullpath), CLANG_BIN);
-         alt_cc = llvm_fullpath;
- 
-       }