diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile
index b1bf91eac85c..8c03d32bba8f 100644
--- a/databases/phppgadmin/Makefile
+++ b/databases/phppgadmin/Makefile
@@ -15,11 +15,6 @@ DISTNAME=	phpPgAdmin-${PORTVERSION}
 MAINTAINER=	nbm@FreeBSD.org
 COMMENT=	Web Based Postgres Administration
 
-.if defined(WITH_APACHE2)
-RUN_DEPENDS+=	${LOCALBASE}/libexec/apache2/libphp4.so:${PORTSDIR}/www/mod_php4
-.else
-RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
-.endif
 POSTGRESQL_PORT?=	databases/postgresql7
 LIB_DEPENDS=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 
@@ -27,8 +22,11 @@ USE_BZIP2=	yes
 WRKSRC=		${WRKDIR}/phpPgAdmin
 NO_BUILD=	YES
 
+.include <bsd.port.pre.mk>
+.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
+
 do-install:
 	${MKDIR} ${PREFIX}/www/data.default/phpPgAdmin/
 	${CP} -R ${WRKSRC}/* ${PREFIX}/www/data.default/phpPgAdmin/
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/phppgadmin/pkg-plist b/databases/phppgadmin/pkg-plist
index 15c556da18c5..413906a2ab20 100644
--- a/databases/phppgadmin/pkg-plist
+++ b/databases/phppgadmin/pkg-plist
@@ -37,7 +37,7 @@ www/data.default/phpPgAdmin/classes/database/Postgres72.php
 www/data.default/phpPgAdmin/classes/database/Postgres73.php
 www/data.default/phpPgAdmin/classes/database/Postgres74.php
 www/data.default/phpPgAdmin/conf/.cvsignore
-@unexec if cmp -s %D/www/data.default/phpPgAdmin3/conf/config.inc.php %D/www/data.default/phpPgAdmin3/conf/config.inc.php-dist; then rm -f %D/www/data.default/phpPgAdmin3/conf/config.inc.php; fi
+@unexec if cmp -s %D/www/data.default/phpPgAdmin/conf/config.inc.php %D/www/data.default/phpPgAdmin/conf/config.inc.php-dist; then rm -f %D/www/data.default/phpPgAdmin/conf/config.inc.php; fi
 www/data.default/phpPgAdmin3/conf/config.inc.php-dist
 @exec [ -f %B/config.inc.php ] || cp %B/%f %B/config.inc.php
 www/data.default/phpPgAdmin/constraints.php