diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile
index 6a10cf22df20..c44f8140cd94 100644
--- a/databases/phppgadmin/Makefile
+++ b/databases/phppgadmin/Makefile
@@ -1,43 +1,43 @@
 # Created by: nbm
 
 PORTNAME=	phppgadmin
 DISTVERSIONPREFIX=	REL_
 DISTVERSION=	7-13-0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases www
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Web Based Postgres Administration
 
 LICENSE=	GPLv2
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 USES=		cpe tar:bzip2 php:web,flavors shebangfix
 USE_GITHUB=	yes
 
 .if !defined(WITHOUT_PHP_DEPENDS)
 USE_PHP=	pgsql pcre session mbstring
 .endif
 
 CPE_VENDOR=	phppgadmin_project
 SHEBANG_FILES=	lang/synch
 PGADMDIR?=	www/phpPgAdmin
 PLIST_SUB+=	PGADMDIR=${PGADMDIR}
 
 pre-everything::
 	@${ECHO_CMD} "# you can customize the installation directory"
 	@${ECHO_CMD} "# by setting PGADMDIR in /etc/make.conf"
 
 do-configure:
 	${REINPLACE_CMD} -e "s|/usr/bin/pg|${LOCALBASE}/bin/pg|" \
 		${WRKSRC}/conf/config.inc.php-dist
 	${RM} ${WRKSRC}/conf/config.inc.php \
 		${WRKSRC}/conf/config.inc.php-dist.bak
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PGADMDIR}
 	${CP} -Rp ${WRKSRC}/ ${STAGEDIR}${PREFIX}/${PGADMDIR}/
 
 .include <bsd.port.mk>
diff --git a/databases/phppgadmin/files/patch-adodb-postgres64.inc.php b/databases/phppgadmin/files/patch-adodb-postgres64.inc.php
new file mode 100644
index 000000000000..0c62e353ce1a
--- /dev/null
+++ b/databases/phppgadmin/files/patch-adodb-postgres64.inc.php
@@ -0,0 +1,14 @@
+--- libraries/adodb/drivers/adodb-postgres64.inc.php.orig	2020-11-07 06:09:12 UTC
++++ libraries/adodb/drivers/adodb-postgres64.inc.php
+@@ -122,6 +122,11 @@ WHERE relkind in ('r','v') AND (c.relname='%s' or c.re
+ 	// changes the metaColumnsSQL, adds columns: attnum[6]
+ 	}
+ 	
++	function __construct()
++	{
++	// changes the metaColumnsSQL, adds columns: attnum[6]
++	}
++	
+ 	function ServerInfo()
+ 	{
+ 		if (isset($this->version)) return $this->version;
diff --git a/databases/phppgadmin/files/patch-all_db.php b/databases/phppgadmin/files/patch-all_db.php
new file mode 100644
index 000000000000..a2f8dbd52592
--- /dev/null
+++ b/databases/phppgadmin/files/patch-all_db.php
@@ -0,0 +1,11 @@
+--- all_db.php.orig	2020-11-07 06:09:12 UTC
++++ all_db.php
+@@ -199,7 +199,7 @@
+ 		echo "\t\t<td class=\"data1\">\n";
+ 		echo "\t\t\t<select name=\"formEncoding\">\n";
+ 		echo "\t\t\t\t<option value=\"\"></option>\n";
+-		while (list ($key) = each ($data->codemap)) {
++		foreach ($data->codemap as $key => $value) {
+ 		    echo "\t\t\t\t<option value=\"", htmlspecialchars($key), "\"",
+ 				($key == $_POST['formEncoding']) ? ' selected="selected"' : '', ">",
+ 				$misc->printVal($key), "</option>\n";