diff --git a/ChangeLog b/ChangeLog
index 26d4c210b3..518541c52b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-08-15  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Fix have_base_pc / have_base_x_pc typo.
+
+	* gdk/x11/gdkdrawable-x11.c gtk/gtksettings.c: Remove panoxft.h includes.
+	(#313417, James Andrewartha)
+
+	* configure.in: Add fontconfig to X_PACKAGES, since we use it for
+	FcNameConstant(). (More of #313417)
+
 2005-08-15  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfilechooserdefault.c: When using gtk_dialog_run() for
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 26d4c210b3..518541c52b 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2005-08-15  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Fix have_base_pc / have_base_x_pc typo.
+
+	* gdk/x11/gdkdrawable-x11.c gtk/gtksettings.c: Remove panoxft.h includes.
+	(#313417, James Andrewartha)
+
+	* configure.in: Add fontconfig to X_PACKAGES, since we use it for
+	FcNameConstant(). (More of #313417)
+
 2005-08-15  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfilechooserdefault.c: When using gtk_dialog_run() for
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 26d4c210b3..518541c52b 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+2005-08-15  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Fix have_base_pc / have_base_x_pc typo.
+
+	* gdk/x11/gdkdrawable-x11.c gtk/gtksettings.c: Remove panoxft.h includes.
+	(#313417, James Andrewartha)
+
+	* configure.in: Add fontconfig to X_PACKAGES, since we use it for
+	FcNameConstant(). (More of #313417)
+
 2005-08-15  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfilechooserdefault.c: When using gtk_dialog_run() for
diff --git a/configure.in b/configure.in
index 730ffc1eb6..8459ff31f5 100644
--- a/configure.in
+++ b/configure.in
@@ -1023,8 +1023,8 @@ AC_SUBST(GDK_PIXBUF_DEP_CFLAGS)
 GDK_PIXBUF_XLIB_PACKAGES=
 GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
 GDK_PIXBUF_XLIB_EXTRA_LIBS=
-
-X_PACKAGES=
+	
+X_PACKAGES=fontconfig
 GDK_EXTRA_LIBS="$GDK_WLIBS"
 GDK_EXTRA_CFLAGS=
 	
@@ -1033,12 +1033,21 @@ GTK_DEP_PACKAGES_FOR_X=
 GTK_DEP_LIBS_FOR_X=
 
 if test "x$gdktarget" = "xx11"; then
+  #
+  # We use fontconfig very peripherally when decoding the default
+  # settings.
+  #
+  if $PKG_CONFIG --exists fontconfig; then : ; else
+    AC_MSG_ERROR([
+*** fontconfig (http://www.fontconfig.org) is required by the X11 backend.])
+  fi
+
   #
   # Check for basic X packages; we use pkg-config if available
   #
   if $PKG_CONFIG --exists x11 xext; then
     have_base_x_pc=true
-    X_PACKAGES="x11 xext"
+    X_PACKAGES="$X_PACKAGES x11 xext"
     x_libs="`pkg-config --libs x11 xext`"
     
     # Strip out any .la files that pkg-config might give us (this happens
@@ -1285,7 +1294,7 @@ if test "x$gdktarget" = "xx11"; then
     X_PACKAGES="$X_PACKAGES xfixes"
   fi
 
-  if $have_base_pc ; then
+  if $have_base_x_pc ; then
     GDK_EXTRA_LIBS="$x_extra_libs"
   else
     GDK_EXTRA_LIBS="$X_LIBS $x_extra_libs -lX11 $GDK_EXTRA_LIBS"
diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
index e18208bde7..49ab08f61f 100644
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.c
@@ -29,8 +29,6 @@
 #include "gdkx.h"
 #include "gdkregion-generic.h"
 
-#include <pango/pangoxft.h>
-
 #include <cairo-xlib.h>
 
 #include <stdlib.h>
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 0cb964cf58..d4474c078a 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -29,10 +29,6 @@
 #include "x11/gdkx.h"
 #endif
 
-#if 0
-#include <pango/pangoxft.h>
-#endif
-
 typedef struct _GtkSettingsValuePrivate GtkSettingsValuePrivate;
 
 typedef enum