diff --git a/lib/libxcb/Makefile.inc b/lib/libxcb/Makefile.inc
index 27e5e1ec2..576e7c896 100644
--- a/lib/libxcb/Makefile.inc
+++ b/lib/libxcb/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.4 2009/05/23 15:08:50 matthieu Exp $
+#	$OpenBSD: Makefile.inc,v 1.5 2009/05/31 18:01:28 matthieu Exp $
 
 LIBXCB=	${.CURDIR}/../../../dist/libxcb
 
@@ -6,9 +6,7 @@ CPPFLAGS=	-I${X11BASE}/include \
 		-I${.CURDIR}/../src -I${LIBXCB}/src \
 		-DHAVE_CONFIG_H
 
-XCB_LIBS!=	pkg-config --libs xcb
-
-LDADD?=		${XCB_LIBS}
+LDADD?=		`pkg-config --libs xcb`
 
 .SUFFIXES: .in
 
diff --git a/lib/libxcb/libxcb/Makefile b/lib/libxcb/libxcb/Makefile
index 1c9691407..ee9382429 100644
--- a/lib/libxcb/libxcb/Makefile
+++ b/lib/libxcb/libxcb/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2009/05/23 15:08:51 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.5 2009/05/31 18:01:28 matthieu Exp $
 
 LIB=		xcb
 
@@ -31,9 +31,7 @@ NEEDED=		pthread-stubs xau >= 0.99.2 xdmcp
 EXTRA_PKGCONFIG_SUBST=	 '-e s,@NEEDED@,${NEEDED},g' \
 			    '-e s,@LIBS@,,g' \
 
-NEEDED_LIBS!=	pkg-config --libs "${NEEDED}"
-
-LDADD=		${NEEDED_LIBS}
+LDADD=		`pkg-config --libs "${NEEDED}"`
 
 install-ext:
 	@echo installing ${EXTHEADERS} in ${INCSDIR}/${HEADER_SUBDIR}
diff --git a/lib/xcb-util/Makefile.inc b/lib/xcb-util/Makefile.inc
index 91c7be108..be99e720e 100644
--- a/lib/xcb-util/Makefile.inc
+++ b/lib/xcb-util/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.1.1.1 2009/05/23 14:43:12 matthieu Exp $
+#	$OpenBSD: Makefile.inc,v 1.2 2009/05/31 18:01:28 matthieu Exp $
 
 XCBUTIL=	${.CURDIR}/../../../dist/xcb-util
 
@@ -16,9 +16,7 @@ LIB?=		xcb-${SUBLIB}
 _SRCDIR?=	${XCBUTIL}/${SUBLIB}
 PKGCONFIG?=	xcb-${SUBLIB}.pc
 
-LIBADD!=	pkg-config --libs xcb 
-
-LDADD?=		${LIBADD}
+LDADD?=		`pkg-config --libs xcb`
 
 .PATH:		${XCBUTIL}/${SUBLIB}
 
diff --git a/lib/xcb-util/icccm/Makefile b/lib/xcb-util/icccm/Makefile
index 84d78b0e8..0cfde5715 100644
--- a/lib/xcb-util/icccm/Makefile
+++ b/lib/xcb-util/icccm/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1.1.1 2009/05/23 14:43:12 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.2 2009/05/31 18:01:28 matthieu Exp $
 
 SUBLIB=		icccm
 
@@ -8,7 +8,7 @@ CPPFLAGS=	-I${XCBUTIL}/property -I${XCBUTIL}/event -I${XCBUTIL}/atom
 
 HEADERS=	xcb_icccm.h
 
-LDADD!=		pkg-config --libs xcb-atom xcb-event xcb-property
+LDADD=		`pkg-config --libs xcb-atom xcb-event xcb-property`
 
 .include <bsd.lib.mk>
 .include <bsd.xorg.mk>
diff --git a/lib/xcb-util/image/Makefile b/lib/xcb-util/image/Makefile
index ad9328e90..f5a830af8 100644
--- a/lib/xcb-util/image/Makefile
+++ b/lib/xcb-util/image/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1.1.1 2009/05/23 14:43:12 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.2 2009/05/31 18:01:28 matthieu Exp $
 
 SUBLIB=		image
 
@@ -6,7 +6,7 @@ SRCS=		xcb_image.c
 
 HEADERS=	xcb_image.h xcb_pixel.h
 
-LDADD!=		pkg-config --libs xcb xcb-shm xcb-aux
+LDADD=		`pkg-config --libs xcb xcb-shm xcb-aux`
 
 .include <bsd.lib.mk>
 .include <bsd.xorg.mk>
diff --git a/lib/xcb-util/property/Makefile b/lib/xcb-util/property/Makefile
index 2c58912bd..4357c9818 100644
--- a/lib/xcb-util/property/Makefile
+++ b/lib/xcb-util/property/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1.1.1 2009/05/23 14:43:12 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.2 2009/05/31 18:01:28 matthieu Exp $
 
 SUBLIB=		property
 
@@ -8,7 +8,7 @@ CPPFLAGS=	-I${XCBUTIL}/event
 
 HEADERS=	xcb_property.h
 
-LDADD!=		pkg-config --libs xcb xcb-event
+LDADD=		`pkg-config --libs xcb xcb-event`
 
 .include <bsd.lib.mk>
 .include <bsd.xorg.mk>
diff --git a/lib/xcb-util/renderutil/Makefile b/lib/xcb-util/renderutil/Makefile
index 1035fca0b..dbf2d1b7c 100644
--- a/lib/xcb-util/renderutil/Makefile
+++ b/lib/xcb-util/renderutil/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1.1.1 2009/05/23 14:43:12 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.2 2009/05/31 18:01:28 matthieu Exp $
 
 LIB=		xcb-render-util
 
@@ -8,7 +8,7 @@ SRCS=		cache.c glyph.c util.c
 
 HEADERS=	xcb_renderutil.h
 
-LDADD!=		pkg-config --libs xcb xcb-render
+LDADD=		`pkg-config --libs xcb xcb-render`
 
 .include <bsd.lib.mk>
 .include <bsd.xorg.mk>