diff --git a/devel/arcanist-lib/Makefile b/devel/arcanist-lib/Makefile
index d9f729e30fc4..c9060a121758 100644
--- a/devel/arcanist-lib/Makefile
+++ b/devel/arcanist-lib/Makefile
@@ -1,93 +1,92 @@
 PORTNAME?=	arcanist
-PORTVERSION?=	20220518
-PORTREVISION?=	11
+PORTVERSION?=	20230530
 CATEGORIES?=	devel
 PKGNAMESUFFIX=	${SLAVE_PKGNAMESUFFIX}${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	grembo@FreeBSD.org
 COMMENT?=	Phabricator Arcanist libraries
 WWW?=		https://secure.phabricator.com/book/arcanist/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		php:cli,flavors python:env shebangfix
 IGNORE_WITH_PHP=	85
 USE_GITHUB=	yes
 GH_ACCOUNT=	phacility
-GH_TAGNAME=	85c953e
+GH_TAGNAME=	e50d1bc
 USE_PHP=	curl dom simplexml zlib
 
 SHEBANG_FILES=	bin/arc bin/phage scripts/*.php scripts/hgdaemon/*.php \
 		src/parser/*.php support/arcanoid/arcanoid.py support/lib/*.php \
 		support/unit/*.php support/xhpast/*.php \
 		support/xhpast/bin/*.php
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 PORTSCOUT=	ignore:1
 SLAVEPORT?=	lib
 
 PLIST=		${.CURDIR}/pkg-plist
 
 PHP_DESTDIR=	lib/php/arcanist
 
 .if ${SLAVEPORT} == lib
 SLAVE_PKGNAMESUFFIX=	-${SLAVEPORT}
 
 OPTIONS_DEFINE=		ENCODINGS
 OPTIONS_DEFAULT=	ENCODINGS
 ENCODINGS_DESC=		Support for encodings other than utf-8
 ENCODINGS_USE=		PHP=mbstring
 
 .else # link only
 
 RUN_DEPENDS=	arcanist-lib${PHP_PKGNAMESUFFIX}>=${PORTVERSION}_${PORTREVISION}:devel/arcanist-lib@${PHP_FLAVOR}
 
 CONFLICTS=	arc arcanist-php??
 
 PLIST_FILES=	bin/arc
 
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PHP_VER} >= 83
 post-patch:
 	@${REINPLACE_CMD} -e 's/ | E_STRICT//' ${WRKSRC}/support/init/init-script.php
 .endif
 
 do-install:
 .if ${SLAVEPORT} == bin
 	${RLN} ../${PHP_DESTDIR}/bin/arc ${STAGEDIR}${PREFIX}/bin/arc
 .else
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}
 	cd ${WRKSRC} ; ${PAX} -rw * ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions/
 	@${REINPLACE_CMD} \
 		's|%%PREFIX%%|${PREFIX}|g; \
 		 s|%%PHP_DESTDIR%%|${PHP_DESTDIR}|g' \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/support/shell/hooks/bash-completion.sh
 	@${REINPLACE_CMD} \
 		's|%%PKGNAME%%|${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}|g; \
 		 s|%%PKGVERSION%%|${PKGVERSION}|g; \
 		 s|%%PKGORIGIN%%|${PKGORIGIN}|g' \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/toolset/workflow/ArcanistVersionWorkflow.php
 	@${REINPLACE_CMD} \
 		's|%%PHP_CMD%%|${PREFIX}/bin/php|g' \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/lint/linter/ArcanistPhpLinter.php \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/moduleutils/PhutilLibraryMapBuilder.php \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/phage/bootloader/PhagePHPAgentBootloader.php \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/runtime/ArcanistRuntime.php \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/utils/PhutilExecutionEnvironment.php \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/workflow/ArcanistLiberateWorkflow.php
 	@${REINPLACE_CMD} \
 		's|%%PYTHON_CMD%%|${PYTHON_CMD}|g' \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/workflow/ArcanistAnoidWorkflow.php
 	${RM} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/resources/ssl/default.pem
 	${RLN} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/support/shell/hooks/bash-completion.sh \
 		 ${STAGEDIR}${PREFIX}/share/bash-completion/completions/arc
 	${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/bin/arc shell-complete --generate
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/arcanist-lib/distinfo b/devel/arcanist-lib/distinfo
index 32a852b67821..ff94ca5601b0 100644
--- a/devel/arcanist-lib/distinfo
+++ b/devel/arcanist-lib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1656002343
-SHA256 (phacility-arcanist-20220518-85c953e_GH0.tar.gz) = a9bfc625e480ab02f8ad01f07b0e8741fb3e0db01e26c9295c1725dd799e6cb2
-SIZE (phacility-arcanist-20220518-85c953e_GH0.tar.gz) = 2273237
+TIMESTAMP = 1766842580
+SHA256 (phacility-arcanist-20230530-e50d1bc_GH0.tar.gz) = 27b7b16b19d296ed8b25d5c1ac403b1a10a2f162cac5e4d0827746180edf06a3
+SIZE (phacility-arcanist-20230530-e50d1bc_GH0.tar.gz) = 2273735
diff --git a/devel/arcanist-lib/files/patch-src_utils_utf8.php b/devel/arcanist-lib/files/patch-src_utils_utf8.php
deleted file mode 100644
index c08303b6b5f0..000000000000
--- a/devel/arcanist-lib/files/patch-src_utils_utf8.php
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/utils/utf8.php.orig	2022-05-17 23:20:14 UTC
-+++ src/utils/utf8.php
-@@ -288,8 +288,12 @@ function phutil_utf8_strlen($string) {
-  * @return int   The character length of the string.
-  */
- function phutil_utf8_strlen($string) {
--  if (function_exists('utf8_decode')) {
--    return strlen(utf8_decode($string));
-+  if (function_exists('mb_strlen')) {
-+    // Historically, this was just a call to strlen(utf8_decode(
-+    // but, since PHP 8.2, that function is deprecated, so this is
-+    // the current equivalent.
-+    // https://we.phorge.it/T15188
-+    return mb_strlen($string, 'UTF-8');
-   }
-   return count(phutil_utf8v($string));
- }