diff --git a/net/phpldapadmin/Makefile b/net/phpldapadmin/Makefile
index 27e9f5036850..4b1908c6346b 100644
--- a/net/phpldapadmin/Makefile
+++ b/net/phpldapadmin/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	phpldapadmin
 DISTVERSION=	1.2.6.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net www
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@bsdserwis.com
 COMMENT=	PHP application to administer LDAP over the web
-WWW=		https://phpldapadmin.sourceforge.net/
+WWW=		https://github.com/leenooks/phpLDAPadmin/wiki
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe php:web,flavors tar:tgz
 CPE_VENDOR=	phpldapadmin_project
 USE_GITHUB=	yes
 GH_ACCOUNT=	leenooks
 GH_PROJECT=	phpLDAPadmin
 USE_PHP=	gettext iconv ldap session xml
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	MCRYPT
 
 MCRYPT_DESC=	Use pecl-mcrypt for password hashing
 MCRYPT_USE=	PHP=mcrypt
 
 .include <bsd.port.options.mk>
 
 GROUPS?=	${WWWGRP}
 CFGDIR=		config
 CFGFILE=	config.php
 
 PLIST=		${WRKDIR}/plist
 PLIST_FILES=	'@sample(,${GROUPS},640) ${WWWDIR_REL}/config/config.php.example ${WWWDIR_REL}/config/config.php'
 
 SUB_LIST+=	PKGNAME=${PKGNAME}
 SUB_FILES+=	pkg-message
 
 .SILENT:
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	cd ${WRKSRC} ;							    \
 	${FIND} . ! -type d ! -name ${CFGFILE}.example ! -name .cvsignore   \
 	    ! -name .gitignore ! -name *.orig | ${SORT}			    \
 	    | ${SED} -e "s!^\.!${WWWDIR_REL}!"			>${PLIST} ;
 
 do-install:
 	cd ${WRKSRC} ;					 \
 	for src in $$( ${FIND} . ! -name .cvsignore	 \
 		! -name .gitignore ! -name *.orig) ; do	 \
 	    dst=${STAGEDIR}${WWWDIR}$${src#.} ;		 \
 	    if ${TEST} -d $$src ; then			 \
 		${MKDIR} $$dst ;			 \
 	    else					 \
 		${INSTALL_DATA} $$src $$dst ;		 \
 	    fi						 \
 	done
 
 .include <bsd.port.post.mk>
diff --git a/net/phpldapadmin/files/patch-lib_ds__ldap.php b/net/phpldapadmin/files/patch-lib_ds__ldap.php
new file mode 100644
index 000000000000..41dfc700729a
--- /dev/null
+++ b/net/phpldapadmin/files/patch-lib_ds__ldap.php
@@ -0,0 +1,11 @@
+--- lib/ds_ldap.php.orig	2023-04-01 13:46:16 UTC
++++ lib/ds_ldap.php
+@@ -991,7 +991,7 @@ class ldap extends DS {
+ 		$return = $dn;
+ 
+ 		foreach ($this->getBaseDN() as $base) {
+-			if (preg_match("/${base}$/i",$dn)) {
++			if (preg_match("/{$base}$/i",$dn)) {
+ 				$return = $base;
+ 				break;
+ 			}
diff --git a/net/phpldapadmin/files/patch-lib_xmlTemplates.php b/net/phpldapadmin/files/patch-lib_xmlTemplates.php
new file mode 100644
index 000000000000..26ee3c3f4215
--- /dev/null
+++ b/net/phpldapadmin/files/patch-lib_xmlTemplates.php
@@ -0,0 +1,11 @@
+--- lib/xmlTemplates.php.orig	2023-04-01 13:46:16 UTC
++++ lib/xmlTemplates.php
+@@ -122,7 +122,7 @@ abstract class xmlTemplates {
+ 
+ 					# Ignore any files that are not the predefined custom files.
+ 					if ($_SESSION[APPCONFIG]->getValue('appearance','custom_templates_only')
+-						&& ! preg_match("/^${custom_prefix}/",$file))
++						&& ! preg_match("/^{$custom_prefix}/",$file))
+ 						continue;
+ 
+ 					$filename = sprintf('%s/%s',$dir,$file);