diff --git a/cad/chipmunk/Makefile b/cad/chipmunk/Makefile
index 54823e542a5..6066cb76e94 100644
--- a/cad/chipmunk/Makefile
+++ b/cad/chipmunk/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2004/11/21 21:41:23 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2004/12/30 00:17:52 espie Exp $
 
 COMMENT=	"electronic CAD system"
 
-PKGNAME=	chipmunk-1.57
+PKGNAME=	chipmunk-1.57p0
 DISTNAME=	psys-1.57
 DISTFILES=	psys-1.57.tar.gz webdoc1.46.tar.gz log-5.61.tar.gz \
 		view-1.13.tar.gz until-1.13.tar.gz wol-1.13.tar.gz \
diff --git a/cad/chipmunk/pkg/PLIST b/cad/chipmunk/pkg/PLIST
index ef509134914..2db96457575 100644
--- a/cad/chipmunk/pkg/PLIST
+++ b/cad/chipmunk/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.4 2004/09/18 10:28:09 espie Exp $
+@comment $OpenBSD: PLIST,v 1.5 2004/12/30 00:17:52 espie Exp $
+@conflict wol-*
 @conflict analog-*
 bin/analog
 bin/cview
diff --git a/devel/uuid/Makefile b/devel/uuid/Makefile
index 36a99a72778..f3cc1f78302 100644
--- a/devel/uuid/Makefile
+++ b/devel/uuid/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2004/12/02 21:55:07 robert Exp $
+# $OpenBSD: Makefile,v 1.7 2004/12/30 00:16:05 espie Exp $
 
 COMMENT=	"ISO-C API and CLI for generating Universally Unique Identifiers"
 
 DISTNAME=	uuid-1.1.1
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	devel
 
 MAINTAINER=	Robert Nagy <robert@openbsd.org>
diff --git a/devel/uuid/pkg/PLIST b/devel/uuid/pkg/PLIST
index 0913673b109..1ed93b08bee 100644
--- a/devel/uuid/pkg/PLIST
+++ b/devel/uuid/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/08/03 13:50:23 robert Exp $
+@comment $OpenBSD: PLIST,v 1.3 2004/12/30 00:16:06 espie Exp $
+@conflict e2fsprogs-*
 bin/uuid
 bin/uuid-config
 include/uuid.h
diff --git a/net/wol/Makefile b/net/wol/Makefile
index b9536bc46e0..38c79568961 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2004/12/16 00:31:27 alek Exp $
+# $OpenBSD: Makefile,v 1.5 2004/12/30 00:17:52 espie Exp $
 
 COMMENT=		"Wake On Lan client"
 
 DISTNAME=		wol-0.7.1
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=		net
 
 HOMEPAGE=		http://ahh.sourceforge.net/wol/
diff --git a/net/wol/pkg/PLIST b/net/wol/pkg/PLIST
index 88e52730e56..0a6b8d0ea6a 100644
--- a/net/wol/pkg/PLIST
+++ b/net/wol/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/09/15 18:17:47 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2004/12/30 00:17:52 espie Exp $
+@conflict chipmunk-*
 bin/wol
 bin/wol-bootptab
 bin/wol-dhcpdconf
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index 105afabeabb..212f9874521 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2004/12/20 10:35:35 alek Exp $
+# $OpenBSD: Makefile,v 1.4 2004/12/30 00:16:05 espie Exp $
 # $FreeBSD: ports/sysutils/e2fsprogs/Makefile,v 1.8 2003/02/20 19:00:47 knu Exp $
 
 COMMENT=		"utilities to manipulate ext2 filesystems"
 
 DISTNAME=		e2fsprogs-1.27
-PKGNAME=		${DISTNAME}p1
+PKGNAME=		${DISTNAME}p2
 CATEGORIES=		sysutils
 
 HOMEPAGE=		http://e2fsprogs.sourceforge.net/
diff --git a/sysutils/e2fsprogs/pkg/PLIST b/sysutils/e2fsprogs/pkg/PLIST
index 120470d856f..650e694ad80 100644
--- a/sysutils/e2fsprogs/pkg/PLIST
+++ b/sysutils/e2fsprogs/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/09/15 18:39:32 espie Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/12/30 00:16:05 espie Exp $
+@conflict uuid-*
 bin/chattr
 bin/lsattr
 bin/uuidgen