diff --git a/archivers/pecl-zstd/Makefile b/archivers/pecl-zstd/Makefile
index 33c5604734e7..055445f91d60 100644
--- a/archivers/pecl-zstd/Makefile
+++ b/archivers/pecl-zstd/Makefile
@@ -1,29 +1,23 @@
 PORTNAME=	zstd
 PORTVERSION=	0.14.0
 CATEGORIES=	archivers
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Compression and decompression with Zstandard library
 WWW=		https://pecl.php.net/package/zstd \
 		https://github.com/kjdev/php-ext-zstd
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 USES=		php:pecl pkgconfig
 
 CONFIGURE_ARGS=	--with-libzstd
 
-.include <bsd.port.pre.mk>
-
 post-patch:
-.if ${PHP_VER} >= 85
-	${REINPLACE_CMD} -e 's|ext/standard/php_smart_string|Zend/zend_smart_string|' \
-		${WRKSRC}/zstd.c
-.endif
 # Clean up bundled libraries
 	@${RM} -r ${WRKSRC}/zstd/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/archivers/pecl-zstd/files/patch-php85 b/archivers/pecl-zstd/files/patch-php85
new file mode 100644
index 000000000000..2fc932c491fa
--- /dev/null
+++ b/archivers/pecl-zstd/files/patch-php85
@@ -0,0 +1,16 @@
+Obtained from:	https://github.com/kjdev/php-ext-zstd/commit/e061583361d4d4167a86dccda385b2944946a09e
+
+--- zstd.c.orig	2024-11-05 21:49:34 UTC
++++ zstd.c
+@@ -30,7 +30,11 @@
+ #include <php_ini.h>
+ #include <ext/standard/file.h>
+ #include <ext/standard/info.h>
++#if PHP_VERSION_ID < 70200
+ #include <ext/standard/php_smart_string.h>
++#else
++#include "Zend/zend_smart_string.h"
++#endif
+ #if defined(HAVE_APCU_SUPPORT)
+ #include <ext/standard/php_var.h>
+ #include <ext/apcu/apc_serializer.h>