diff --git a/devel/p5-Data-UUID/Makefile b/devel/p5-Data-UUID/Makefile
index 19b11b1a731..7e866b66137 100644
--- a/devel/p5-Data-UUID/Makefile
+++ b/devel/p5-Data-UUID/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2006/11/17 17:01:51 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2007/06/11 11:01:27 simon Exp $
 
 SHARED_ONLY=	Yes
 COMMENT=	"extension for generating GUIDs/UUIDs"
 
 MODULES=	cpan
 DISTNAME=	Data-UUID-0.145
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	devel
 
 MAINTAINER=	Kevin Lo <kevlo@openbsd.org>
diff --git a/devel/p5-Data-UUID/pkg/PLIST b/devel/p5-Data-UUID/pkg/PLIST
index d67820c9253..dae9cb6766b 100644
--- a/devel/p5-Data-UUID/pkg/PLIST
+++ b/devel/p5-Data-UUID/pkg/PLIST
@@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2006/01/28 09:51:45 alek Exp $
-@conflict uuid-perl-*
+@comment $OpenBSD: PLIST,v 1.3 2007/06/11 11:01:27 simon Exp $
 ${P5ARCH}/
 ${P5ARCH}/Data/
 ${P5ARCH}/Data/UUID.pm
diff --git a/devel/uuid/Makefile b/devel/uuid/Makefile
index 96c8ce92f9d..aa0da914cfc 100644
--- a/devel/uuid/Makefile
+++ b/devel/uuid/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2007/05/31 05:21:25 robert Exp $
+# $OpenBSD: Makefile,v 1.26 2007/06/11 11:01:27 simon Exp $
 
 SHARED_ONLY=	Yes
 
@@ -8,7 +8,7 @@ COMMENT-perl=	"UUID modules for Perl"
 VERSION=		1.6.0
 DISTNAME=		uuid-${VERSION}
 FULLPKGNAME-main=	uuid-${VERSION}
-FULLPKGNAME-perl= 	p5-UUID-${VERSION}
+FULLPKGNAME-perl= 	p5-UUID-${VERSION}p0
 CATEGORIES=		devel
 SHARED_LIBS=		uuid	13.22 \
 			uuid++	14.21
diff --git a/devel/uuid/pkg/PLIST-perl b/devel/uuid/pkg/PLIST-perl
index 52df046afcd..caffc3218d6 100644
--- a/devel/uuid/pkg/PLIST-perl
+++ b/devel/uuid/pkg/PLIST-perl
@@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST-perl,v 1.5 2006/03/12 23:11:31 robert Exp $
-@conflict p5-Data-UUID-*
+@comment $OpenBSD: PLIST-perl,v 1.6 2007/06/11 11:01:27 simon Exp $
 @comment libdata/perl5/${MACHINE_ARCH}-openbsd/
 @comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.6/
 @comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.6/perllocal.pod