diff --git a/x11/gnome/keyring/Makefile b/x11/gnome/keyring/Makefile
index 42f2707d6da..76b8fe48052 100644
--- a/x11/gnome/keyring/Makefile
+++ b/x11/gnome/keyring/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2006/01/09 12:43:37 alek Exp $
+# $OpenBSD: Makefile,v 1.8 2006/01/17 12:07:11 steven Exp $
 
 COMMENT=		"password agent for the GNOME project"
 
 DISTNAME=		gnome-keyring-0.4.4
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 SHARED_LIBS=		gnome-keyring 0.1
 CATEGORIES=		x11/gnome
 
@@ -14,10 +14,10 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 Xext Xrender atk-1.0.0.0 png c z \
+WANTLIB=		X11 Xext Xft Xrender atk-1.0.0.0 c \
 			fontconfig freetype glib-2.0.0.0 gmodule-2.0.0.0 \
 			gobject-2.0.0.0 m pango-1.0.0.0 pangoft2-1.0.0.0 \
-			pangocairo-1.0.1000.0 cairo glitz
+			pangox-1.0.0.0 pangoxft-1.0.0.0
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-keyring/0.4/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome/libbonoboui/Makefile b/x11/gnome/libbonoboui/Makefile
index ad0177cbed8..6229c7f1a66 100644
--- a/x11/gnome/libbonoboui/Makefile
+++ b/x11/gnome/libbonoboui/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.15 2006/01/08 14:51:51 steven Exp $
+# $OpenBSD: Makefile,v 1.16 2006/01/17 12:07:12 steven Exp $
 
 COMMENT=		"user interface components for bonobo"
 
 VERSION=		2.10.1
 DISTNAME=		libbonoboui-${VERSION}
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 SHARED_LIBS=		bonoboui-2	0.0
 CATEGORIES=		x11/gnome
 
@@ -15,14 +15,14 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 Xext png \
-		Xrender art_lgpl_2 atk-1.0.0.0 audiofile bonobo-2 \
-		bonobo-activation c crypto esd fontconfig freetype gconf-2 \
+WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 Xext Xft Xrender \
+		c crypto fontconfig freetype pthread ssl z \
+		art_lgpl_2 atk-1.0.0.0 audiofile bonobo-2 \
+		bonobo-activation esd gconf-2 \
 		gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 glade-2.0.0.0 \
 		glib-2.0.0.0 gmodule-2.0.0.0 gnomevfs-2 gobject-2.0.0.0 \
 		gthread-2.0.0.0 gtk-x11-2.0.0.0 m pango-1.0.0.0 \
-		pangoft2-1.0.0.0 pangocairo-1.0.1000.0 pthread ssl \
-		xml2 z cairo glitz
+		pangoft2-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 xml2
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libbonoboui/2.10/}
 EXTRACT_SUFX=		.tar.bz2