diff --git a/c/libs/Makefile.am b/c/libs/Makefile.am
index 6e6377e..1c77b58 100644
--- a/c/libs/Makefile.am
+++ b/c/libs/Makefile.am
@@ -3,8 +3,13 @@ INCLUDES = -I@top_srcdir@/c/xlib -I@top_srcdir@/c/libs -I@x_includes@ \
 
 noinst_LTLIBRARIES = libscxxft.la
 
-libscxxft_la_SOURCES = \
-	xft.c xrender.c
+if WITH_XFT
+xft_sources = xft.c xrender.c
+xft_libadd = -lXft
+endif
 
-libscxxft_la_LIBADD = $(X_LIBS) -lXft
+libscxxft_la_SOURCES = \
+	$(xft_sources)
+
+libscxxft_la_LIBADD = $(X_LIBS) $(xft_libadd) 
 libscxxft_la_LDFLAGS= -avoid-version -module
diff --git a/configure.in b/configure.in
index 2d61d23..54a1302 100644
--- a/configure.in
+++ b/configure.in
@@ -23,12 +23,10 @@
  
  	  AC_ARG_WITH(xft, 
 		      AC_HELP_STRING([--with-xft],
-			             [Compile with Xft support]), 
-                      with_xft="yes", 
-                      with_xft="no")
+			             [Compile with Xft support]))
 
 	  dnl Compile with Xft support?
-    	  if test "$with_xft" = "yes"; then
+    	  if test "x$with_xft" = "xyes"; then
 	    AC_CHECKING([xft-config program])
 	    AC_CHECK_PROG([XFT_CONFIG], [xft-config], "yes", "no", $PATH, [])
 
@@ -45,7 +43,7 @@
 	    SCX_PREPEND(\$(XFT_OBJECTS), extra_objects)
 	    AC_SUBST(load_xft_packages, yes)
 	  fi 
-
+        AM_CONDITIONAL(WITH_XFT, test "x$with_xft" = "xyes")
         schemedir='${prefix}'"/scheme"
         libdir='${prefix}'"/lib"
         libsysdir='${prefix}'
diff --git a/pkg-def.scm b/pkg-def.scm
index fadbf92..ee1529a 100644
--- a/pkg-def.scm
+++ b/pkg-def.scm
@@ -10,7 +10,7 @@
 	 (xft? (get-option-value 'with-xft))
          (configure `("./configure"
 		      ,(string-append "--prefix=" prefix)
-		      ,(if xft? "--with-xft" "--without-xft")
+		      ,(if xft? "--with-xft=yes" "--with-xft=no")
 		      ,(string-append "--with-scsh-includes=" scsh-includes)
 		      ,(string-append "--build=" build-host)))