diff --git a/ChangeLog b/ChangeLog
index e62b672bb..1e27edf30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-21  David Shaw  <dshaw@jabberwocky.com>
+
+	* configure.ac: Only check for libusb if we're building with card
+	support.  Noted by Gilles Espinasse.
+
 2006-12-11  Werner Koch  <wk@g10code.com>
 
 	* Makefile.am (DISTCLEANFILES): Removed g10defs.h.
diff --git a/configure.ac b/configure.ac
index 4ff3412d3..c75bf1bed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1278,7 +1278,10 @@ AM_CONDITIONAL(ENABLE_BZIP2_SUPPORT,test x"$have_bz2" = "xyes")
 AC_SUBST(ZLIBS)
 
 # libusb allows us to use the integrated CCID smartcard reader driver.
-GNUPG_CHECK_LIBUSB
+# We don't need it if we don't have card support though.
+if test "$card_support" = yes ; then
+   GNUPG_CHECK_LIBUSB
+fi
 
 # Check for readline support
 GNUPG_CHECK_READLINE