diff --git a/testing/php82-pecl-xdebug/APKBUILD b/testing/php82-pecl-xdebug/APKBUILD
index 336817615529806d59ea539bc13e6edc4286f88f..665c5c102bcc69716919d053ff07ce14cc60d1ec 100644
--- a/testing/php82-pecl-xdebug/APKBUILD
+++ b/testing/php82-pecl-xdebug/APKBUILD
@@ -5,18 +5,17 @@
 pkgname=php82-pecl-xdebug
 _extname=xdebug
 pkgver=3.1.5
-pkgrel=0
+_commit=38817526bd6bd5c44f3df6f02e30778e780d88a8
+pkgrel=1
 pkgdesc="PHP 8.2 extension that provides functions for function traces and profiling - PECL"
 url="https://pecl.php.net/package/xdebug"
 arch="all"
 license="PHP-3.0"
 depends="php82-common"
-makedepends="php82-dev"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz
-	fix-version.patch
-	fix-build.patch
-	"
-builddir="$srcdir/$_extname-$pkgver"
+makedepends="php82-dev linux-headers"
+#source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz
+source="php-pecl-$_commit.tar.gz::https://github.com/derickr/xdebug/archive/$_commit.tar.gz"
+builddir="$srcdir/$_extname-$_commit"
 provides="php82-xdebug=$pkgver-r$pkgrel" # for backward compatibility
 replaces="php82-xdebug" # for backward compatibility
 
@@ -48,7 +47,5 @@ package() {
 }
 
 sha512sums="
-882d4033ee6e71a6b861aa7b98c2cdf06bbbc3fcd9f064f2c59391df2efe647a5ad7a5373960847cc6568b88aa2ca85e2ddba53d3c4c1d627b57b9923d222f90  php-pecl-xdebug-3.1.5.tgz
-744c2c996c42b8db085371d4630a42d25389a915ed425254e94252eb0a69ad009fc793209fa0459f8f69e8e25f0597b681a2bd4a8a5e7dbc6ac451d327b34948  fix-version.patch
-319c15c872a65beb924aa40dbdf9f652983e3c93a59fa7f077021b9a0d3860761860353847643e563b2cb7130a62ba2b624c40e4adcad238258738c145a13ff3  fix-build.patch
+4f1dd07960f4e9b6caa866af1a9a8504d285bd6c1b2e14b146f06b208b76ab734cb746c12bd74f82caf670a88bc667d7f8484feff7e7c0ec24517d23c6f6c4f1  php-pecl-38817526bd6bd5c44f3df6f02e30778e780d88a8.tar.gz
 "
diff --git a/testing/php82-pecl-xdebug/fix-build.patch b/testing/php82-pecl-xdebug/fix-build.patch
deleted file mode 100644
index aa2f4e5e45efda7d03dc9aef666ef3dfed01704e..0000000000000000000000000000000000000000
--- a/testing/php82-pecl-xdebug/fix-build.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7b4fcfe6ae300e272113fa612d64b19815bece80 Mon Sep 17 00:00:00 2001
-From: Shivam Mathur <shivam_jpr@hotmail.com>
-Date: Tue, 11 Jan 2022 03:30:41 +0000
-Subject: [PATCH 1/2] Fix for removal of JMPZNZ opcode in PHP 8.2
-
-JMPZNZ opcode has been removed in PHP 8.2. So this limits the
-handling of the JMPZNZ opcode to lower versions.
-
-Ref: https://github.com/php/php-src/pull/7857
----
- src/coverage/code_coverage.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/coverage/code_coverage.c b/src/coverage/code_coverage.c
-index 16be68747..31ec7feec 100644
---- a/src/coverage/code_coverage.c
-+++ b/src/coverage/code_coverage.c
-@@ -300,11 +300,13 @@ static int xdebug_find_jumps(zend_op_array *opa, unsigned int position, size_t *
- 		*jump_count = 2;
- 		return 1;
- 
-+#if PHP_VERSION_ID < 80200
- 	} else if (opcode.opcode == ZEND_JMPZNZ) {
- 		jumps[0] = XDEBUG_ZNODE_JMP_LINE(opcode.op2, position, base_address);
- 		jumps[1] = position + ((int32_t) opcode.extended_value / (int32_t) sizeof(zend_op));
- 		*jump_count = 2;
- 		return 1;
-+#endif
- 
- 	} else if (opcode.opcode == ZEND_FE_FETCH_R || opcode.opcode == ZEND_FE_FETCH_RW) {
- 		jumps[0] = position + 1;
-
diff --git a/testing/php82-pecl-xdebug/fix-version.patch b/testing/php82-pecl-xdebug/fix-version.patch
deleted file mode 100644
index 81a8882614aec7580f24d2d6ed3f298530bfdd94..0000000000000000000000000000000000000000
--- a/testing/php82-pecl-xdebug/fix-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/config.m4
-+++ b/config.m4
-@@ -19,7 +19,7 @@
-   if test "$PHP_XDEBUG_FOUND_VERNUM" -lt "70200"; then
-     AC_MSG_ERROR([not supported. Need a PHP version >= 7.2.0 and < 8.2.0 (found $PHP_XDEBUG_FOUND_VERSION)])
-   else
--    if test "$PHP_XDEBUG_FOUND_VERNUM" -ge "80200"; then
-+    if test "$PHP_XDEBUG_FOUND_VERNUM" -ge "80201"; then
-       AC_MSG_ERROR([not supported. Need a PHP version >= 7.2.0 and < 8.2.0 (found $PHP_XDEBUG_FOUND_VERSION)])
-     else
-       AC_MSG_RESULT([supported ($PHP_XDEBUG_FOUND_VERSION)])