diff --git a/devel/pear-PHPUnit/Makefile b/devel/pear-PHPUnit/Makefile
index d20d1dede18f..89c413b3ef2f 100644
--- a/devel/pear-PHPUnit/Makefile
+++ b/devel/pear-PHPUnit/Makefile
@@ -9,29 +9,20 @@ PORTNAME=	PHPUnit
 PORTVERSION=	1.3.3
 CATEGORIES=	devel www pear
 MASTER_SITES=	http://pear.phpunit.de/get/
+PKGNAMEPREFIX=	pear-
 
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	PEAR regression testing framework for unit tests
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+RUN_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
 
-MANUAL_PACKAGE_BUILD=	attempts to contact pear.phpunit.de during install phase
+CONFLICTS=	pear-PHPUnit-[23]*
 
-CHANNEL=	pear.phpunit.de
-SUB_FILES=	pear-deinstall pear-install
-SUB_LIST+=	CHANNEL=${CHANNEL}
-PKGINSTALL=	${WRKDIR}/pear-install
-PKGDEINSTALL=	${WRKDIR}/pear-deinstall
-
-NO_LATEST_LINK=	yes
-
-FILES=		PHPUnit.php PHPUnit/GUI/Gtk.php PHPUnit/GUI/HTML.php \
-		PHPUnit/GUI/HTML.tpl PHPUnit/GUI/SetupDecorator.php \
-		PHPUnit/Assert.php PHPUnit/RepeatedTest.php PHPUnit/Skeleton.php \
-		PHPUnit/TestCase.php PHPUnit/TestDecorator.php \
-		PHPUnit/TestFailure.php PHPUnit/TestListener.php \
-		PHPUnit/TestResult.php PHPUnit/TestSuite.php
+PEAR_CHANNEL=	phpunit
+PEAR_AUTOINSTALL=	yes
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
diff --git a/devel/pear-PHPUnit/files/pear-deinstall.in b/devel/pear-PHPUnit/files/pear-deinstall.in
deleted file mode 100644
index ccbf7b82cb25..000000000000
--- a/devel/pear-PHPUnit/files/pear-deinstall.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Remove package declaration from PEAR's registry and optionally delete
-# a non-standard channel.
-
-if [ x$2 != xDEINSTALL -a x$2 != xPOST-DEINSTALL ]; then
-    exit
-fi
-PKG_NAME=${1%%-[0-9._]*}
-PACKAGE=$(echo $PKG_NAME | sed 's/pear-//')
-
-PEAR=${PKG_PREFIX}/bin/pear
-CHANNEL=%%CHANNEL%%
-
-if [ "$2" = "DEINSTALL" ]; then
-	if [ "x${CHANNEL}" != "x" ]; then
-		${PEAR} uninstall -r -n ${CHANNEL}/${PACKAGE} || true
-	else
-		${PEAR} uninstall -r -n ${PACKAGE} || true
-	fi
-else
-	if [ "x${CHANNEL}" != "x" ]; then
-		${PEAR} channel-delete ${CHANNEL}
-	fi
-fi
diff --git a/devel/pear-PHPUnit/files/pear-install.in b/devel/pear-PHPUnit/files/pear-install.in
deleted file mode 100644
index 2ec01250b2f3..000000000000
--- a/devel/pear-PHPUnit/files/pear-install.in
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Register the package $1 in the port registry and optionally add a
-# non-standard channel.
-
-PREFIX=${PKG_PREFIX:=%%PREFIX%%}
-PEAR=${PREFIX}/bin/pear
-PKGREGDIR=${PREFIX}/share/pear/packages/$1
-CHANNEL=%%CHANNEL%%
-
-[ "x$1" = "x" ] && exit 1
-if [ "x$2" = "xPOST-INSTALL" ]; then
-	if [ "x${CHANNEL}" != "x" ]; then
-		${PEAR} channel-add http://${CHANNEL}/channel.xml
-	fi
-	${PEAR} install -r -n -f ${PKGREGDIR}/package.xml
-fi