diff --git a/databases/pecl-memcached/Makefile b/databases/pecl-memcached/Makefile
index e5e1c231e375..3154396d3b6b 100644
--- a/databases/pecl-memcached/Makefile
+++ b/databases/pecl-memcached/Makefile
@@ -1,46 +1,38 @@
 PORTNAME=	memcached
 PORTVERSION=	3.3.0
 CATEGORIES=	databases
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PHP extension for interfacing with memcached via libmemcached library
 WWW=		https://pecl.php.net/package/memcached \
 		https://github.com/php-memcached-dev/php-memcached
 
 LICENSE=	PHP30
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	libmemcached>=1.0.18:databases/libmemcached
 LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 
 USES=		php:build,pecl pkgconfig
 USE_PHP=	session:build
 
 CONFIGURE_ARGS=	--enable-memcached-json \
 		--enable-memcached-protocol \
 		--enable-memcached-session \
 		--with-libmemcached-dir=${LOCALBASE}
 
 OPTIONS_DEFINE=	IGBINARY MSGPACK SASL
 OPTIONS_DEFAULT=SASL
 IGBINARY_DESC=	Binary serializer support
 MSGPACK_DESC=	MessagePack serializer support
 
 IGBINARY_CONFIGURE_ENABLE=	memcached-igbinary
 IGBINARY_USE=		PHP=igbinary:build
 MSGPACK_BUILD_DEPENDS=	${PECL_PKGNAMEPREFIX}msgpack>=0:devel/pecl-msgpack@${PHP_FLAVOR}
 MSGPACK_CONFIGURE_ENABLE=	memcached-msgpack
 MSGPACK_RUN_DEPENDS=	${PECL_PKGNAMEPREFIX}msgpack>=0:devel/pecl-msgpack@${PHP_FLAVOR}
 SASL_CONFIGURE_ENABLE=	memcached-sasl
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
 
-.include <bsd.port.pre.mk>
-
-post-patch:
-.if ${PHP_VER} >= 85
-	@${REINPLACE_CMD} -e 's|ext/standard/php_smart_string.h|Zend/zend_smart_string.h|' \
-		${WRKSRC}/php_memcached_private.h
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/pecl-memcached/files/patch-php85 b/databases/pecl-memcached/files/patch-php85
index 0262a948c7f6..4860955286e7 100644
--- a/databases/pecl-memcached/files/patch-php85
+++ b/databases/pecl-memcached/files/patch-php85
@@ -1,11 +1,25 @@
+Obtained from:	https://github.com/php-memcached-dev/php-memcached/commit/bb83855d1874d1741ec51277f2ed496a476d35ff
+		https://github.com/php-memcached-dev/php-memcached/commit/de7d53d13aecd329f03eab2eaf51c1ad8fa5c18f
+
 --- php_memcached.c.orig	2024-10-17 17:34:21 UTC
 +++ php_memcached.c
 @@ -3961,7 +3961,7 @@ zend_class_entry *php_memc_get_exception_base(int root
  		}
  	}
  
 -	return zend_exception_get_default();
 +	return zend_ce_exception;
  }
  
  
+--- php_memcached_private.h.orig	2024-10-17 17:34:21 UTC
++++ php_memcached_private.h
+@@ -43,7 +43,7 @@
+ #include <ext/standard/info.h>
+ #include <zend_extensions.h>
+ #include <zend_exceptions.h>
+-#include <ext/standard/php_smart_string.h>
++#include <Zend/zend_smart_string.h>
+ #include <ext/standard/php_var.h>
+ #include <ext/standard/basic_functions.h>
+