Index: head/devel/capstone4/Makefile
===================================================================
--- head/devel/capstone4/Makefile
+++ head/devel/capstone4/Makefile
@@ -1,29 +1,35 @@
 # $FreeBSD$
 
 PORTNAME=	capstone
-PORTVERSION=	4.0
-PORTREVISION=	1
+PORTVERSION=	4.0.1
 CATEGORIES=	devel
 PKGNAMESUFFIX=	4
 
+PATCH_SITES=	https://github.com/aquynh/capstone/pull/1589/commits/
+PATCHFILES=	046846b2ea189142482754c13ee0ed54cb4f4e5b.patch:-p1
+
 MAINTAINER=	oleksii.tsai@gmail.com
 COMMENT=	Multi-platform, multi-architecture disassembly framework
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-CONFLICTS_BUILD=	capstone3
-
 USES=		gmake
-USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	aquynh
-GH_TAGNAME=	d99cbc3
+USE_LDCONFIG=	yes
 
-MAKE_ENV+=	INSTALL_LIB="${INSTALL_LIB}" \
-		INSTALL_DATA="${INSTALL_DATA}"
+MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}" \
+		INSTALL_LIB="${INSTALL_LIB}"
 
-TEST_ENV=	${MAKE_ENV} LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib
+TEST_ENV=	${MAKE_ENV} \
+		LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib
 TEST_TARGET=	check
+
+CONFLICTS_BUILD=	capstone3
+
+pre-test:
+# Disable broken tests.
+	@${REINPLACE_CMD} -E 's|^(check:.*)fuzzallcorp|\1|' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
Index: head/devel/capstone4/distinfo
===================================================================
--- head/devel/capstone4/distinfo
+++ head/devel/capstone4/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1468159734
-SHA256 (aquynh-capstone-4.0-d99cbc3_GH0.tar.gz) = 5ead3bcb7941e344016d181ac4180ff901b40deec31c207ced4c243f38217227
-SIZE (aquynh-capstone-4.0-d99cbc3_GH0.tar.gz) = 2817325
+TIMESTAMP = 1582069780
+SHA256 (aquynh-capstone-4.0.1_GH0.tar.gz) = 79bbea8dbe466bd7d051e037db5961fdb34f67c9fac5c3471dd105cfb1e05dc7
+SIZE (aquynh-capstone-4.0.1_GH0.tar.gz) = 3434276
+SHA256 (046846b2ea189142482754c13ee0ed54cb4f4e5b.patch) = ba7e8eb2bafaea0050168a6b418e7b65593cf4852df6dfca74ad6b49e8ee56f3
+SIZE (046846b2ea189142482754c13ee0ed54cb4f4e5b.patch) = 692
Index: head/devel/capstone4/pkg-plist
===================================================================
--- head/devel/capstone4/pkg-plist
+++ head/devel/capstone4/pkg-plist
@@ -1,14 +1,19 @@
+bin/cstool
 include/capstone/arm.h
 include/capstone/arm64.h
 include/capstone/capstone.h
+include/capstone/evm.h
+include/capstone/m680x.h
+include/capstone/m68k.h
 include/capstone/mips.h
 include/capstone/platform.h
 include/capstone/ppc.h
 include/capstone/sparc.h
 include/capstone/systemz.h
+include/capstone/tms320c64x.h
 include/capstone/x86.h
 include/capstone/xcore.h
 lib/libcapstone.a
 lib/libcapstone.so
-lib/libcapstone.so.3
+lib/libcapstone.so.4
 libdata/pkgconfig/capstone.pc