diff --git a/x11/xfce4/xfce-utils/Makefile b/x11/xfce4/xfce-utils/Makefile
index 00b1cc61f1e..3b523e586b3 100644
--- a/x11/xfce4/xfce-utils/Makefile
+++ b/x11/xfce4/xfce-utils/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2005/11/10 22:57:38 jolan Exp $
+# $OpenBSD: Makefile,v 1.4 2005/11/16 10:34:23 wilfried Exp $
 
 COMMENT=	"essential utilities and scripts for xfce4"
 V=		4.2.3
 DISTNAME=	xfce-utils-${V}
+PKGNAME=	${DISTNAME}p0
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${V}/src/
 
 HOMEPAGE=	http://www.xfce.org/
@@ -20,11 +21,11 @@ LIB_DEPENDS=	dbh.1.0::databases/dbh \
 		xfcegui4.3.4::x11/xfce4/libxfcegui4 \
 		xfce4mcs-client.2.3,xfce4mcs-manager.2.3::x11/xfce4/libxfce4mcs
 RUN_DEPENDS=	:xfce-mcs-manager-*:x11/xfce4/xfce-mcs-manager
-WANTLIB=	ICE SM X11 Xcursor Xext Xft Xinerama Xrender c fontconfig \
-		freetype m \
+WANTLIB=	ICE SM X11 Xext Xrender c fontconfig \
+		freetype m z \
 		atk-1.0.0.0 gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 glib-2.0.0.0 \
 		gmodule-2.0.0.0 gobject-2.0.0.0 gtk-x11-2.0.0.0 pango-1.0.0.0 \
-		pangoft2-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 \
+		pangocairo-1.0.0.0 pangoft2-1.0.0.0 cairo glitz png \
 		startup-notification-1.0.0 xfce4util.1
 
 CONFIGURE_ARGS+=--with-browser="xterm -e lynx"
diff --git a/x11/xfce4/xffm/Makefile b/x11/xfce4/xffm/Makefile
index a64f9d224ae..6e0ae23f34e 100644
--- a/x11/xfce4/xffm/Makefile
+++ b/x11/xfce4/xffm/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2005/11/10 22:57:41 jolan Exp $
+# $OpenBSD: Makefile,v 1.4 2005/11/16 10:30:13 wilfried Exp $
 
 COMMENT=	"xfce4 file manager"
 V=		4.2.3
 DISTNAME=	xffm-${V}
+PKGNAME=	${DISTNAME}p0
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${V}/src/
 
 HOMEPAGE=	http://www.xfce.org/
@@ -21,12 +22,13 @@ LIB_DEPENDS=	dbh.1.0::databases/dbh \
 		xfcegui4.3.4::x11/xfce4/libxfcegui4 \
 		xfce4mcs-client.2.3,xfce4mcs-manager.2.3::x11/xfce4/libxfce4mcs
 RUN_DEPENDS=	:xfce-mcs-manager-*:x11/xfce4/xfce-mcs-manager
-WANTLIB=	ICE SM X11 Xcursor Xext Xft Xinerama Xrender c fontconfig \
+WANTLIB=	ICE SM X11 Xext Xrender c fontconfig \
 		freetype m pthread z \
 		atk-1.0.0.0 gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 glib-2.0.0.0 \
 		gmodule-2.0.0.0 gobject-2.0.0.0 gthread-2.0.0.0 \
-		gtk-x11-2.0.0.0 pango-1.0.0.0 pangoft2-1.0.0.0 pangox-1.0.0.0 \
-		pangoxft-1.0.0.0 startup-notification-1.0.0 xfce4util.1
+		gtk-x11-2.0.0.0 pango-1.0.0.0 pangocairo-1.0.0.0 \
+		pangoft2-1.0.0.0 cairo glitz png \
+		startup-notification-1.0.0 xfce4util.1
 
 CONFIGURE_ARGS+=--disable-librsvg \
 		--enable-panel \