diff --git a/configure.in.in b/configure.in.in
index 95a5a6ea3..658798da5 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -29,6 +29,20 @@ AC_SUBST(LIBFREETYPE_CFLAGS)
 AC_SUBST(LIBFREETYPE_RPATH)
 
 
+# Check for xft
+KDE_FIND_PATH(xft-config, XFT_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin],)
+
+if test -n "$XFT_CONFIG"; then
+  XFT_LIBS="`$XFT_CONFIG --libs`"
+fi
+
+AC_SUBST(XFT_LIBS)
+
+if test -z "$XFT_LIBS"; then
+        DO_NOT_COMPILE="$DO_NOT_COMPILE kpdf"
+fi
+
+
 dnl ##### Check for libpaper (Debian).
 LIBPAPER_LIBS=
 KDE_CHECK_HEADER(paper.h, [
diff --git a/xpdf/xpdf/Makefile.am b/xpdf/xpdf/Makefile.am
index 40a9f8eb3..94d00d5bf 100644
--- a/xpdf/xpdf/Makefile.am
+++ b/xpdf/xpdf/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../fofi -I$(srcdir)/../splash -I$(srcdir)/../goo $(all_includes) $(LIBFREETYPE_CFLAGS) $(X_INCLUDES) $(QT_INCLUDES)
 
 libxpdf_la_LDFLAGS = $(all_libraries)
-libxpdf_la_LIBADD = $(LIB_X11) $(LIBFREETYPE_LIBS) $(LIBPAPER_LIBS) $(LIBT1) ../goo/libgoo.la ../fofi/libfofi.la ../splash/libsplash.la 
+libxpdf_la_LIBADD = $(LIB_X11) $(LIBFREETYPE_LIBS) $(LIBPAPER_LIBS) $(LIBT1) $(XFT_LIBS) ../goo/libgoo.la ../fofi/libfofi.la ../splash/libsplash.la 
 libxpdf_la_SOURCES = Annot.cc Array.cc BuiltinFont.cc BuiltinFontTables.cc \
      Catalog.cc CharCodeToUnicode.cc CMap.cc Decrypt.cc Dict.cc \
      FontEncodingTables.cc Function.cc Gfx.cc \