diff --git a/security/pear-File_Passwd/Makefile b/security/pear-File_Passwd/Makefile
index 09e0fd97a5dd..764fca887353 100644
--- a/security/pear-File_Passwd/Makefile
+++ b/security/pear-File_Passwd/Makefile
@@ -5,25 +5,17 @@ PORTNAME=	File_Passwd
 PORTVERSION=	1.1.7
 CATEGORIES=	security pear
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR class to manipulate many kinds of password files
 
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+RUN_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 
 LATEST_LINK=	pear-File_Passwd
 OPTIONS_DEFINE=	PEAR_CRYPT_CHAP
 PEAR_CRYPT_CHAP_DESC=	PEAR::Crypt_CHAP support
 
-CATEGORY=	File
-FILES=		Passwd.php Passwd/Common.php Passwd/Unix.php Passwd/Cvs.php \
-		Passwd/Smb.php Passwd/Authbasic.php Passwd/Authdigest.php \
-		Passwd/Custom.php
-TESTS=		testsuite.php test_file_passwd.php test_common.php test_unix.php \
-		test_smb.php test_cvs.php test_authbasic.php test_authdigest.php \
-		test_custom.php README.txt common.txt passwd.unix.txt \
-		passwd.cvs.txt passwd.smb.txt passwd.authbasic.txt \
-		passwd.authdigest.txt passwd.custom.txt
+PEAR_AUTOINSTALL=	yes
 
 .include <bsd.port.pre.mk>