diff --git a/ChangeLog b/ChangeLog
index b361f4211b..fd74f08bc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-06  jacob berkman  <jacob@ximian.com>
+
+	* configure.in: link gdk-pixbuf-xlib against x libs (bug #83442)
+
 Mon Aug  5 17:20:45 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtklabel.c: Patch from Soeren Sandmann
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b361f4211b..fd74f08bc5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2002-08-06  jacob berkman  <jacob@ximian.com>
+
+	* configure.in: link gdk-pixbuf-xlib against x libs (bug #83442)
+
 Mon Aug  5 17:20:45 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtklabel.c: Patch from Soeren Sandmann
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b361f4211b..fd74f08bc5 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+2002-08-06  jacob berkman  <jacob@ximian.com>
+
+	* configure.in: link gdk-pixbuf-xlib against x libs (bug #83442)
+
 Mon Aug  5 17:20:45 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtklabel.c: Patch from Soeren Sandmann
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b361f4211b..fd74f08bc5 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+2002-08-06  jacob berkman  <jacob@ximian.com>
+
+	* configure.in: link gdk-pixbuf-xlib against x libs (bug #83442)
+
 Mon Aug  5 17:20:45 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtklabel.c: Patch from Soeren Sandmann
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b361f4211b..fd74f08bc5 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2002-08-06  jacob berkman  <jacob@ximian.com>
+
+	* configure.in: link gdk-pixbuf-xlib against x libs (bug #83442)
+
 Mon Aug  5 17:20:45 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtklabel.c: Patch from Soeren Sandmann
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b361f4211b..fd74f08bc5 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2002-08-06  jacob berkman  <jacob@ximian.com>
+
+	* configure.in: link gdk-pixbuf-xlib against x libs (bug #83442)
+
 Mon Aug  5 17:20:45 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtklabel.c: Patch from Soeren Sandmann
diff --git a/configure.in b/configure.in
index 4dc3754e35..b3a80e3200 100644
--- a/configure.in
+++ b/configure.in
@@ -1054,7 +1054,7 @@ if test "x$gdktarget" = "xx11"; then
 
   GDK_PIXBUF_XLIB_EXTRA_CFLAGS="$x_cflags"
   # Don't ever pull in the pangoxft libraries for gdk-pixbuf-x11
-  GDK_PIXBUF_XLIB_EXTRA_LIBS="$x_extra_libs `$PKG_CONFIG --libs pangox`"
+  GDK_PIXBUF_XLIB_EXTRA_LIBS="$x_extra_libs $x_libs"
 
   # Check for Xinerama extension (Solaris impl or Xfree impl)
 
diff --git a/contrib/gdk-pixbuf-xlib/ChangeLog b/contrib/gdk-pixbuf-xlib/ChangeLog
index ca15378d86..31953b9941 100644
--- a/contrib/gdk-pixbuf-xlib/ChangeLog
+++ b/contrib/gdk-pixbuf-xlib/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-06  jacob berkman  <jacob@ximian.com>
+
+	* Makefile.am (lib_LTLIBRARIES): link against xlibs
+
 2002-01-25  Federico Mena Quintero  <federico@ximian.com>
 
 	Merge from gdk-pixbuf stable.
diff --git a/contrib/gdk-pixbuf-xlib/Makefile.am b/contrib/gdk-pixbuf-xlib/Makefile.am
index 9098e054a1..af8ab40e2e 100644
--- a/contrib/gdk-pixbuf-xlib/Makefile.am
+++ b/contrib/gdk-pixbuf-xlib/Makefile.am
@@ -7,14 +7,13 @@ INCLUDES = @STRIP_BEGIN@			\
 	@GDK_PIXBUF_XLIB_DEP_CFLAGS@		\
 @STRIP_END@
 
-LDADDS = @STRIP_BEGIN@ 				\
-	@GDK_PIXBUF_XLIB_DEP_LIBS@		\
-@STRIP_END@
-
 libgdk_pixbuf_xlib_2_0_la_LDFLAGS =         \
 	-export-dynamic						\
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
+libgdk_pixbuf_xlib_2_0_la_LIBADD = \
+	@GDK_PIXBUF_XLIB_DEP_LIBS@
+
 libgdk_pixbuf_xlib_2_0_la_SOURCES =         \
 	gdk-pixbuf-xlib-private.h	\
         gdk-pixbuf-xlib.c               \