diff --git a/databases/pecl-memcached/Makefile b/databases/pecl-memcached/Makefile
index 68be734ec0ae..725b43c8a903 100644
--- a/databases/pecl-memcached/Makefile
+++ b/databases/pecl-memcached/Makefile
@@ -3,11 +3,9 @@
 
 PORTNAME=	memcached
 PORTVERSION=	2.2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases
-MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
-DIST_SUBDIR=	PECL
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PHP extension for interfacing with memcached via libmemcached library
@@ -21,13 +19,22 @@ OPTIONS_DEFINE=	IGBINARY SASL
 IGBINARY_DESC=	Binary serializer support
 
 CONFIGURE_ARGS=	--with-libmemcached-dir=${LOCALBASE}
-IGNORE_WITH_PHP=70
 USE_PHP=	json:build session:build
-USES=		php:ext pkgconfig tar:tgz
+USES=		php:ext pkgconfig
+
+GH_TUPLE=	php-${PORTNAME}-dev:php-${PORTNAME}:${PORTVERSION} \
+		php-${PORTNAME}-dev:php-${PORTNAME}:e65be32:php7
+USE_GITHUB=	yes
 
 IGBINARY_CONFIGURE_ENABLE=	memcached-igbinary
 IGBINARY_USE=		PHP=igbinary:build
 SASL_CONFIGURE_ENABLE=	memcached-sasl
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PHP_VER} == 70
+WRKSRC_SUBDIR=	../php-memcached-e65be32
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/pecl-memcached/distinfo b/databases/pecl-memcached/distinfo
index 7a66aee61f16..a3e274d3a99e 100644
--- a/databases/pecl-memcached/distinfo
+++ b/databases/pecl-memcached/distinfo
@@ -1,2 +1,5 @@
-SHA256 (PECL/memcached-2.2.0.tgz) = 17b9600f6d4c807f23a3f5c45fcd8775ca2e61d6eda70370af2bef4c6e159f58
-SIZE (PECL/memcached-2.2.0.tgz) = 70449
+TIMESTAMP = 1481736896
+SHA256 (php-memcached-dev-php-memcached-2.2.0_GH0.tar.gz) = 7248ac9eefedd8ed6babb68da66d58c2a769e9d12380ab9409246cdd7478c00d
+SIZE (php-memcached-dev-php-memcached-2.2.0_GH0.tar.gz) = 79278
+SHA256 (php-memcached-dev-php-memcached-e65be32_GH0.tar.gz) = 36855bf3dd2ccd57cff9d5351c66b4c92985e54b8003c8343a1cd05bf0d6960a
+SIZE (php-memcached-dev-php-memcached-e65be32_GH0.tar.gz) = 82057