diff --git a/databases/pecl-memcached/Makefile b/databases/pecl-memcached/Makefile
index b4b813fad69d..e38771c7b724 100644
--- a/databases/pecl-memcached/Makefile
+++ b/databases/pecl-memcached/Makefile
@@ -1,37 +1,43 @@
 # Created by: Gea-Suan Lin <gslin@gslin.org>
 
 PORTNAME=	memcached
 PORTVERSION=	3.1.5
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PHP extension for interfacing with memcached via libmemcached library
 
 LICENSE=	PHP30
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	libmemcached>=1.0.18:databases/libmemcached
 LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 
 USES=		php:pecl pkgconfig
 USE_PHP=	json:build session:build
 
 CONFIGURE_ARGS=	--enable-memcached-json \
 		--enable-memcached-protocol \
 		--enable-memcached-session \
 		--with-libmemcached-dir=${LOCALBASE}
 
+GH_ACCOUNT=	php-memcached-dev
+GH_PROJECT=	php-memcached
+GH_TAGNAME=	058e9f5
+USE_GITHUB=	yes
+
 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.mk>
diff --git a/databases/pecl-memcached/distinfo b/databases/pecl-memcached/distinfo
index 84a8a940203e..0a9dee308bf2 100644
--- a/databases/pecl-memcached/distinfo
+++ b/databases/pecl-memcached/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575794229
-SHA256 (PECL/memcached-3.1.5.tgz) = b288e45f839593e16c4d8508b241de51a86df4f7322153e6becb9e1c819021fd
-SIZE (PECL/memcached-3.1.5.tgz) = 83015
+TIMESTAMP = 1626714774
+SHA256 (PECL/php-memcached-dev-php-memcached-3.1.5-058e9f5_GH0.tar.gz) = d043c984e66ece589bba3aab02aa7974ae36f9b67b39036bc00e574dab834ca9
+SIZE (PECL/php-memcached-dev-php-memcached-3.1.5-058e9f5_GH0.tar.gz) = 96398
diff --git a/databases/pecl-memcached/files/patch-php_memcached_server.c b/databases/pecl-memcached/files/patch-php_memcached_server.c
deleted file mode 100644
index 4cf1561ad298..000000000000
--- a/databases/pecl-memcached/files/patch-php_memcached_server.c
+++ /dev/null
@@ -1,14 +0,0 @@
-Obtained from:	https://github.com/php-memcached-dev/php-memcached/commit/c94e014da53cc8a3d0510402f36bc6e5e17bf608
-
---- php_memcached_server.c.orig	2019-12-03 22:13:53 UTC
-+++ php_memcached_server.c
-@@ -63,7 +63,9 @@ long s_invoke_php_callback (php_memc_server_cb_t *cb, 
- 	cb->fci.retval = retval;
- 	cb->fci.params = params;
- 	cb->fci.param_count = param_count;
-+#if PHP_VERSION_ID < 80000
- 	cb->fci.no_separation = 1;
-+#endif
- 
- 	if (zend_call_function(&(cb->fci), &(cb->fci_cache)) == FAILURE) {
- 		char *buf = php_memc_printable_func(&(cb->fci), &(cb->fci_cache));