diff --git a/x11/xfce4/orage/Makefile b/x11/xfce4/orage/Makefile
index 06dcffb1508..51770937d30 100644
--- a/x11/xfce4/orage/Makefile
+++ b/x11/xfce4/orage/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2007/05/08 14:54:44 steven Exp $
+# $OpenBSD: Makefile,v 1.2 2007/05/14 06:44:36 steven Exp $
 
 COMMENT=	"advanced calendar for xfce4"
 
 V=		4.5.9.3
 DISTNAME=	orage-${V}
+PKGNAME=	${DISTNAME}p0
 
 HOMEPAGE=	http://www.xfce.org/projects/orage/
 MAINTAINER=	Landry Breuil <gaston@gcu.info>
diff --git a/x11/xfce4/orage/pkg/PLIST b/x11/xfce4/orage/pkg/PLIST
index bce0a4c64bb..cb50ea2df0c 100644
--- a/x11/xfce4/orage/pkg/PLIST
+++ b/x11/xfce4/orage/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/05/08 14:54:44 steven Exp $
-@pkgpath x11/xfce4/xfcalendar
+@comment $OpenBSD: PLIST,v 1.2 2007/05/14 06:44:36 steven Exp $
+@conflict xfcalendar-*
 %%SHARED%%
 bin/globaltime
 bin/orage
diff --git a/x11/xfce4/thunar/Makefile b/x11/xfce4/thunar/Makefile
index 47e3fe59c42..cccbda105c0 100644
--- a/x11/xfce4/thunar/Makefile
+++ b/x11/xfce4/thunar/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2007/05/08 15:14:23 steven Exp $
+# $OpenBSD: Makefile,v 1.2 2007/05/14 06:44:36 steven Exp $
 
 COMMENT=	"lightweight file manager for xfce4"
 
 V=		0.8.0
 DISTNAME=	Thunar-${V}
-PKGNAME=	thunar-${V}
+PKGNAME=	thunar-${V}p0
 
 SHARED_LIBS +=  thunarx-1            4.2      # .4.2
 SHARED_LIBS +=  thunar-vfs-1         4.2      # .4.2
diff --git a/x11/xfce4/thunar/pkg/PLIST b/x11/xfce4/thunar/pkg/PLIST
index 24d5f642c72..4f98fdbbf05 100644
--- a/x11/xfce4/thunar/pkg/PLIST
+++ b/x11/xfce4/thunar/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/05/08 15:14:23 steven Exp $
-@pkgpath x11/xfce4/xffm
+@comment $OpenBSD: PLIST,v 1.2 2007/05/14 06:44:36 steven Exp $
+@conflict xffm-*
 %%SHARED%%
 bin/Thunar
 bin/thunar
diff --git a/x11/xfce4/xfce-mcs-plugins/Makefile b/x11/xfce4/xfce-mcs-plugins/Makefile
index db4070711ab..32b2cbeb93e 100644
--- a/x11/xfce4/xfce-mcs-plugins/Makefile
+++ b/x11/xfce4/xfce-mcs-plugins/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2007/05/10 06:48:42 steven Exp $
+# $OpenBSD: Makefile,v 1.12 2007/05/14 06:44:36 steven Exp $
 
 COMMENT=	"settings manager plug-ins for xfce4"
 
@@ -21,8 +21,9 @@ USE_GMAKE=	Yes
 LIBTOOL_FLAGS=	--tag=disable-static
 MODULES=	devel/gettext
 LIB_DEPENDS=	xfce4mcs-client.>=3.5,xfce4mcs-manager.>=3.5::x11/xfce4/libxfce4mcs \
-                xfcegui4.>=4::x11/xfce4/libxfcegui4
+		xfcegui4.>=4::x11/xfce4/libxfcegui4
 RUN_DEPENDS=	:xfce-mcs-manager->=4.4.0:x11/xfce4/xfce-mcs-manager
+BUILD_DEPENDS=	${RUN_DEPENDS}
 WANTLIB=	ICE SM X11 Xcursor Xext Xrandr Xrender Xxf86vm expat \
 		Xau Xdmcp Xfixes Xi Xinerama fontconfig freetype m \
 		atk-1.0 gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 \
diff --git a/x11/xfce4/xfce4-panel/Makefile b/x11/xfce4/xfce4-panel/Makefile
index f973a721048..6c2777a7758 100644
--- a/x11/xfce4/xfce4-panel/Makefile
+++ b/x11/xfce4/xfce4-panel/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2007/05/08 08:45:58 steven Exp $
+# $OpenBSD: Makefile,v 1.12 2007/05/14 06:44:36 steven Exp $
 
 COMMENT=	"panel for Xfce4 desktop"
 V=		4.4.1
 DISTNAME=	xfce4-panel-${V}
+PKGNAME=	${DISTNAME}p0
 
 SHARED_LIBS=	xfce4panel 2.2 #2.2
 
diff --git a/x11/xfce4/xfce4-panel/pkg/PLIST b/x11/xfce4/xfce4-panel/pkg/PLIST
index 7d25ad02fe9..6d9ec082e6c 100644
--- a/x11/xfce4/xfce4-panel/pkg/PLIST
+++ b/x11/xfce4/xfce4-panel/pkg/PLIST
@@ -1,10 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.4 2007/05/08 08:45:58 steven Exp $
-@pkgpath x11/xfce4/xfce4-datetime
-@pkgpath x11/xfce4/xfce4-iconbox
-@pkgpath x11/xfce4/xfce4-showdesktop
-@pkgpath x11/xfce4/xfce4-systray
-@pkgpath x11/xfce4/xfce4-taskbar
-@pkgpath x11/xfce4/xfce4-trigger-launcher
+@comment $OpenBSD: PLIST,v 1.5 2007/05/14 06:44:36 steven Exp $
+@conflict xfce4-datetime-*
+@conflict xfce4-iconbox-*
+@conflict xfce4-showdesktop-*
+@conflict xfce4-systray-*
+@conflict xfce4-taskbar-*
+@conflict xfce4-trigger-launcher-*
 %%SHARED%%
 bin/xfce4-iconbox
 bin/xfce4-panel
diff --git a/x11/xfce4/xfce4-session/Makefile b/x11/xfce4/xfce4-session/Makefile
index 792c6507a02..cc3a7d363ff 100644
--- a/x11/xfce4/xfce4-session/Makefile
+++ b/x11/xfce4/xfce4-session/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.12 2007/05/08 14:14:03 steven Exp $
+# $OpenBSD: Makefile,v 1.13 2007/05/14 06:44:36 steven Exp $
 
 COMMENT=	"xfce4 session manager"
 
 V=		4.4.1
 DISTNAME=	xfce4-session-${V}
+PKGNAME=	${DISTNAME}p0
 
 SHARED_LIBS +=  xfsm-4.2             0.1      # .0.1
 
diff --git a/x11/xfce4/xfce4-session/pkg/PLIST b/x11/xfce4/xfce4-session/pkg/PLIST
index 02af5d56e11..67557d4f7b8 100644
--- a/x11/xfce4/xfce4-session/pkg/PLIST
+++ b/x11/xfce4/xfce4-session/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.4 2007/05/08 14:14:03 steven Exp $
+@comment $OpenBSD: PLIST,v 1.5 2007/05/14 06:44:36 steven Exp $
+@conflict xfce4-toys-*
 %%SHARED%%
 bin/xfce4-autostart-editor
 bin/xfce4-session