diff --git a/databases/gq/Makefile b/databases/gq/Makefile
index 1de48b57582..1efd60b0cfa 100644
--- a/databases/gq/Makefile
+++ b/databases/gq/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2005/11/12 10:39:07 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2005/11/15 13:23:15 wilfried Exp $
 
 COMMENT=	"GTK-based LDAP client"
 
 DISTNAME=	gq-1.0beta1
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	databases
 
 HOMEPAGE=	http://biot.com/gq/
@@ -18,10 +18,9 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gqclient/}
 
-WANTLIB=	X11 Xft Xrender atk-1.0.0.0 \
-		c crypto fontconfig freetype glib-2.0.0.0 gmodule-2.0.0.0 \
-		gobject-2.0.0.0 m pango-1.0.0.0 pangox-1.0.0.0 \
-		pangoxft-1.0.0.0 ssl z krb5 sasl2
+WANTLIB=	X11 atk-1.0.0.0 c cairo crypto fontconfig freetype glib-2.0.0.0 \
+		gmodule-2.0.0.0 gobject-2.0.0.0 krb5 m pango-1.0.0.0 \
+		pangocairo-1.0.0.0 pangoft2-1.0.0.0 sasl2 ssl z
 
 MODULES=	devel/gettext
 
diff --git a/devel/gconf-editor/Makefile b/devel/gconf-editor/Makefile
index d772c793b7b..763a36dfdea 100644
--- a/devel/gconf-editor/Makefile
+++ b/devel/gconf-editor/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2005/05/25 23:25:25 marcm Exp $
+# $OpenBSD: Makefile,v 1.11 2005/11/15 13:27:57 wilfried Exp $
 
 COMMENT=		"editor for the GConf configuration system"
 
 VERSION=		2.10.0
 DISTNAME=		gconf-editor-${VERSION}
-#PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=		devel x11/gnome
 
 HOMEPAGE=		http://www.gnome.org/
@@ -16,14 +16,14 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=	ORBit-2.0.0 X11 Xft Xrender atk-1.0.0.0 c SM \
+WANTLIB=	ORBit-2.0.0 X11 Xext Xrender atk-1.0.0.0 c SM \
 		fontconfig freetype 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 iconv intl m pango-1.0.0.0 pangoft2-1.0.0.0 \
-		pangoxft-1.0.0.0 pangox-1.0.0.0 popt pthread esd art_lgpl_2 \
+		popt pthread esd art_lgpl_2 \
 		gnomecanvas-2 ICE ORBitCosNaming-2 audiofile gnomevfs-2 jpeg z \
 		gnome-2 xml2 crypto bonobo-activation bonobo-2 ssl bonoboui-2 \
-		gnome-keyring
+		gnome-keyring cairo glitz pangocairo-1.0.0.0 png
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gconf-editor/2.10/}
 EXTRACT_SUFX=		.tar.bz2