diff --git a/net/p5-POE-Component-Client-DNS/Makefile b/net/p5-POE-Component-Client-DNS/Makefile
index 6a9ad53b07e..16f9aaafa68 100644
--- a/net/p5-POE-Component-Client-DNS/Makefile
+++ b/net/p5-POE-Component-Client-DNS/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2005/05/24 16:46:25 msf Exp $
+# $OpenBSD: Makefile,v 1.2 2005/12/07 20:06:57 wilfried Exp $
 
 COMMENT=	"DNS module for the Perl Object Environment"
 
 DISTNAME=	POE-Component-Client-DNS-0.98
-PKGNAME=	p5-${DISTNAME}
+PKGNAME=	p5-${DISTNAME}p0
 CATEGORIES=	net perl5
 
 MAINTAINER=	Mathieu Sauve-Frankel <msf@openbsd.org>
@@ -17,7 +17,8 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=POE/} 
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	::net/p5-Net-DNS
+RUN_DEPENDS=	::devel/p5-POE \
+		::net/p5-Net-DNS
 
 CONFIGURE_STYLE= perl
 
diff --git a/net/p5-POE-Component-Client-DNS/pkg/PLIST b/net/p5-POE-Component-Client-DNS/pkg/PLIST
index d5b8df04859..42d7dc39fb7 100644
--- a/net/p5-POE-Component-Client-DNS/pkg/PLIST
+++ b/net/p5-POE-Component-Client-DNS/pkg/PLIST
@@ -1,6 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2005/05/24 16:46:25 msf Exp $
-${P5SITE}/POE/
-${P5SITE}/POE/Component/
-${P5SITE}/POE/Component/Client/
+@comment $OpenBSD: PLIST,v 1.2 2005/12/07 20:06:58 wilfried Exp $
 ${P5SITE}/POE/Component/Client/DNS.pm
 @man man/man3p/POE::Component::Client::DNS.3p
diff --git a/net/p5-POE-Component-Pcap/Makefile b/net/p5-POE-Component-Pcap/Makefile
index 7b70eefb161..91eabb57518 100644
--- a/net/p5-POE-Component-Pcap/Makefile
+++ b/net/p5-POE-Component-Pcap/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2005/05/24 06:28:19 msf Exp $
+# $OpenBSD: Makefile,v 1.2 2005/12/07 20:09:36 wilfried Exp $
 
 COMMENT=	"POE interface to Net::Pcap"
 
 DISTNAME=	POE-Component-Pcap-0.04
-PKGNAME=	p5-${DISTNAME}
+PKGNAME=	p5-${DISTNAME}p0
 CATEGORIES=	net perl5
 
 MAINTAINER=	Mathieu Sauve-Frankel <msf@openbsd.org>
@@ -16,9 +16,10 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=POE/} 
 
-BUILD_DEPENDS=	::net/p5-Net-Pcap \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	::devel/p5-POE \
+		::net/p5-Net-Pcap \
 		::net/p5-NetPacket
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
 # regress requires root privileges and a network connection
 REGRESS_IS_INTERACTIVE= Yes
diff --git a/net/p5-POE-Component-Pcap/pkg/PLIST b/net/p5-POE-Component-Pcap/pkg/PLIST
index 7f1b56a54d7..fd83b83a8b1 100644
--- a/net/p5-POE-Component-Pcap/pkg/PLIST
+++ b/net/p5-POE-Component-Pcap/pkg/PLIST
@@ -1,5 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2005/05/24 06:28:19 msf Exp $
-${P5SITE}/POE/
-${P5SITE}/POE/Component/
+@comment $OpenBSD: PLIST,v 1.2 2005/12/07 20:09:36 wilfried Exp $
 ${P5SITE}/POE/Component/Pcap.pm
 @man man/man3p/POE::Component::Pcap.3p