diff --git a/srcpkgs/php8.0-pear b/srcpkgs/php8.0-pear
new file mode 120000
index 00000000000..104f2d35908
--- /dev/null
+++ b/srcpkgs/php8.0-pear
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0/patches/php.ini.patch b/srcpkgs/php8.0/patches/php.ini.patch
index 07e38a04cf4..00428db5270 100644
--- a/srcpkgs/php8.0/patches/php.ini.patch
+++ b/srcpkgs/php8.0/patches/php.ini.patch
@@ -7,7 +7,7 @@ index 794d3e8ddb..c7acf9c883 100644
  
  ; UNIX: "/path1:/path2"
 -;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
++include_path = ".:/usr/share/pear8.0"
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index 381f073a73d..74c50da0e46 100644
--- a/srcpkgs/php8.0/template
+++ b/srcpkgs/php8.0/template
@@ -1,6 +1,6 @@
 # Template file for 'php8.0'
 pkgname=php8.0
-version=8.0.23
+version=8.0.25
 revision=1
 _php_version=8.0
 hostmakedepends="bison pkg-config apache-devel"
@@ -14,15 +14,17 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="PHP-3.01"
 homepage="https://www.php.net"
 changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
-distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=a2dd50e9c4a0328d921b6bc914e8b4e6572f94f09867318f88acca5ac4fa76c7
+# this is the source where the www.php.net code pulls the tarballs it serves
+# at https://www.php.net/distributions/
+distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
+checksum=349a2b5a01bfccbc9af8afdf183e57bed3349706a084f3c4694aa4c7ff7cb2e9
 
 conf_files="/etc/php${_php_version}/php.ini"
 
 lib32disabled=yes
 
 if [ -n "$CROSS_BUILD" ]; then
-	# phar needs php to build
+	# phar and pear need php to build
 	hostmakedepends+=" php${_php_version}"
 	CFLAGS+=" -DHAVE_LIBDL
 		 -DHAVE_DLOPEN
@@ -89,7 +91,7 @@ do_build() {
 		--with-mysqli=shared,mysqlnd \
 		--with-openssl=shared \
 		--with-external-pcre \
-		--without-pear \
+		--with-pear=/usr/share/pear${_php_version}
 		--with-pdo-mysql=shared,mysqlnd \
 		--with-pdo-odbc=shared,unixODBC,$XBPS_CROSS_BASE/usr \
 		--with-pdo-pgsql=shared,$XBPS_CROSS_BASE/usr \
@@ -111,7 +113,7 @@ do_build() {
 
 	EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
 	export EXTENSION_DIR
-	PEAR_INSTALLDIR=/usr/share/pear
+	PEAR_INSTALLDIR=/usr/share/pear${_php_version}
 	export PEAR_INSTALLDIR
 	EXTRA_LIBS="-ldl"
 	export EXTRA_LIBS
@@ -217,6 +219,27 @@ php8.0-embed_package() {
 	}
 }
 
+php8.0-pear_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}
+	 php${_php_version}-devel-${version}_${revision} autoconf"
+	short_desc+=' - PHP Extension and Application Repository'
+	conf_files="/etc/php${_php_version}/pear.conf"
+	pkg_install() {
+		cd ${wrksrc}/build
+		local _env="INSTALL_ROOT=${PKGDESTDIR} PHP_PEAR_PHP_BIN=php${_php_version}"
+		if [ -n "$CROSS_BUILD" ]; then
+			_env+=" PEAR_PHP=/usr/bin/php${_php_version}"
+		fi
+		make install-pear ${_env}
+		rm -rf ${PKGDESTDIR}/.{channels,depdb,depdblock,filemap,lock,registry}
+		rm -rf ${PKGDESTDIR}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry}
+		mv ${PKGDESTDIR}/usr/bin/pear{,${_php_version}}
+		mv ${PKGDESTDIR}/usr/bin/peardev{,${_php_version}}
+		mv ${PKGDESTDIR}/usr/bin/pecl{,${_php_version}}
+	}
+}
+
 php8.0-enchant_package() {
 	lib32disabled=yes
 	depends="php${_php_version}-${version}_${revision}"
diff --git a/srcpkgs/php8.0/update b/srcpkgs/php8.0/update
index c4d9bc5958c..566cd800569 100644
--- a/srcpkgs/php8.0/update
+++ b/srcpkgs/php8.0/update
@@ -1,2 +1,3 @@
 pkgname=php
 ignore="8.[1-9].*"
+site="https://www.php.net/distributions/"