diff --git a/sysutils/bulk_extractor/Makefile b/sysutils/bulk_extractor/Makefile
index 554739e61039..fa15b78d40f1 100644
--- a/sysutils/bulk_extractor/Makefile
+++ b/sysutils/bulk_extractor/Makefile
@@ -1,46 +1,54 @@
 PORTNAME=	bulk_extractor
-PORTVERSION=	2.0.3
+PORTVERSION=	2.1.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Program that scans a disk image and extracts useful information
 WWW=		https://github.com/simsong/bulk_extractor
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libafflib.so:sysutils/afflib \
-		libboost_system.so:devel/boost-libs \
+LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libewf.so:devel/libewf \
 		libexiv2.so:graphics/exiv2 \
 		libexpat.so:textproc/expat2 \
 		libgcrypt.so:security/libgcrypt \
-		libgpg-error.so:security/libgpg-error
+		libgpg-error.so:security/libgpg-error \
+		libre2.so:devel/re2
 
 USES=		autoreconf compiler:c++17-lang gnome iconv:wchar_t localbase \
-		sqlite ssl
+		pkgconfig python:build sqlite ssl
 USE_GITHUB=	yes
-USE_GNOME=	libxml2
 
 GH_ACCOUNT=	simsong
 GH_TUPLE=	simsong:be20_api:${GH_TAG_BE20_API}:be20_api \
 		dfxml-working-group:dfxml_cpp:${GH_TAG_DFXML_CPP}:dfxml_cpp \
-		dfxml-working-group:dfxml_schema:${GH_TAG_DFXML_SCHEMA}:dfxml_schema
-GH_TAG_BE20_API=	f63dcd5
-GH_TAG_DFXML_CPP=	09030bc
+		dfxml-working-group:dfxml_schema:${GH_TAG_DFXML_SCHEMA}:dfxml_schema \
+		nemtrif:utfcpp:${GH_TAG_UTFCPP}:utfcpp
+GH_TAG_BE20_API=	c031194
+GH_TAG_DFXML_CPP=	1e92fe8
 GH_TAG_DFXML_SCHEMA=	f2a702e
+GH_TAG_UTFCPP=	2ad9957
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-exiv2=true
 
 TEST_TARGET=	check
 
-PLIST_FILES=	bin/bulk_extractor bin/test_be man/man1/bulk_extractor.1.gz
+PLIST_FILES=	bin/bulk_extractor man/man1/bulk_extractor.1.gz
 
 post-extract:
 	${CP} -R ${WRKSRC_be20_api}/* ${WRKSRC}/src/be20_api/
 	${CP} -R ${WRKSRC_dfxml_cpp}/* ${WRKSRC}/src/be20_api/dfxml_cpp/
+	${CP} -R ${WRKSRC_utfcpp}/* ${WRKSRC}/src/be20_api/utfcpp/
 	${CP} -R ${WRKSRC_dfxml_schema}/* ${WRKSRC}/dfxml_schema/
 
+pre-configure:
+	(cd ${WRKSRC} && ${PYTHON_CMD} etc/makefile_builder.py)
+
+post-configure:
+	${REINPLACE_CMD} -e 's|-isystem -pipe|-pipe -isystem|' ${WRKSRC}/src/Makefile
+
 .include <bsd.port.mk>
diff --git a/sysutils/bulk_extractor/distinfo b/sysutils/bulk_extractor/distinfo
index 62bf07914da9..e58609b00fec 100644
--- a/sysutils/bulk_extractor/distinfo
+++ b/sysutils/bulk_extractor/distinfo
@@ -1,9 +1,11 @@
-TIMESTAMP = 1688292189
-SHA256 (simsong-bulk_extractor-v2.0.3_GH0.tar.gz) = 42c16b0d5708c3bda0bb44eec14dc06b69590496ede550ee736100597a43710f
-SIZE (simsong-bulk_extractor-v2.0.3_GH0.tar.gz) = 42335471
-SHA256 (simsong-be20_api-f63dcd5_GH0.tar.gz) = 76713af7d1430d5ade05603f218f5a0d9523357b292319e935ef941033a8b4c2
-SIZE (simsong-be20_api-f63dcd5_GH0.tar.gz) = 485552
-SHA256 (dfxml-working-group-dfxml_cpp-09030bc_GH0.tar.gz) = caf43f6b8440fb7acc3069602d513d36886c7413209043274cc88f6615363502
-SIZE (dfxml-working-group-dfxml_cpp-09030bc_GH0.tar.gz) = 177520
+TIMESTAMP = 1707710662
+SHA256 (simsong-bulk_extractor-v2.1.0_GH0.tar.gz) = 9445d63ff5db53b82ae3dfa1100329c0508d4a2a76593534c460616a868e6616
+SIZE (simsong-bulk_extractor-v2.1.0_GH0.tar.gz) = 44861588
+SHA256 (simsong-be20_api-c031194_GH0.tar.gz) = 09b7219e9eb61e8447ebd92952375f4c46c7338b8f0184a8704159433a4af85b
+SIZE (simsong-be20_api-c031194_GH0.tar.gz) = 472327
+SHA256 (dfxml-working-group-dfxml_cpp-1e92fe8_GH0.tar.gz) = 3eb1879769f588bb747bfc24bb24ba48f852a19dfd17ea014896d4818a7e1856
+SIZE (dfxml-working-group-dfxml_cpp-1e92fe8_GH0.tar.gz) = 177565
 SHA256 (dfxml-working-group-dfxml_schema-f2a702e_GH0.tar.gz) = ce7034f36dda27b7dd4192a05545c87f69a68bcc1321e7ffdaeb638bf41919be
 SIZE (dfxml-working-group-dfxml_schema-f2a702e_GH0.tar.gz) = 10421
+SHA256 (nemtrif-utfcpp-2ad9957_GH0.tar.gz) = 1b6329dbe8a82e42ae92096a8f49d96c2ba0f0ae8872dad534d28463c94117c5
+SIZE (nemtrif-utfcpp-2ad9957_GH0.tar.gz) = 28752