diff --git a/configure.in b/configure.in
index fcfe03b..cae1dd2 100644
--- a/configure.in
+++ b/configure.in
@@ -45,9 +45,18 @@
 
 	  dnl Compile with Xft support?
     	  if test "$with_xft" = "yes"; then
-	    LIBS="$LIBS -L${x_libraries}"
-	    AC_CHECK_LIB(Xrender, XRenderQueryExtension, SCX_PREPEND(-lXrender, x_libraries))
-	    AC_CHECK_LIB(Xft, XftFontOpen, SCX_PREPEND(-lXft, x_libraries))
+	    AC_CHECKING([xft-config program])
+	    AC_CHECK_PROG([XFT_CONFIG], [xft-config], "yes", "no", $PATH, [])
+
+	    if test "$XFT_CONFIG" = "yes"; then
+              SCX_PREPEND(`xft-config --libs`, x_libraries)
+              SCX_PREPEND(`xft-config --cflags`, x_includes)
+	    else
+	      LIBS="$LIBS -L${x_libraries}"
+	      AC_CHECK_LIB(Xrender, XRenderQueryExtension, SCX_PREPEND(-lXrender, x_libraries))
+	      AC_CHECK_LIB(Xft, XftFontOpen, SCX_PREPEND(-lXft, x_libraries))
+            fi
+
 	    AC_DEFINE([WITH_XFT], 1, [Define 1 if compiling with Xft support])
 	    SCX_PREPEND(\$(XFT_OBJECTS), extra_objects)
 	    AC_SUBST(load_xft_packages, yes)