diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 0c2699d3..11044cfa 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,10 +1,12 @@
 2007-12-18  Kolja Waschk <kawk
 
     * doc/UrJTAG.txt, src/jtag.txt: Cosmetics, Copyright
+    * src/tap/Makefile.am: include cable driver for USB Blaster and
+      FT2232-based cables if any of libftdi or ftd2xx is present
 
 2007-12-16  Kolja Waschk <kawk>
 
-	* jtag.c: Don't abort on invalid command line options
+    * jtag.c: Don't abort on invalid command line options
     * configure.ac: Reorganized the libusb/libftdi detection.
     * data/MANUFACTURERS: Change 11110000111 code to point to
       "ARM" instead of Sharp to stop misdetection of other 
diff --git a/jtag/src/tap/Makefile.am b/jtag/src/tap/Makefile.am
index 27a93139..3a60b01a 100644
--- a/jtag/src/tap/Makefile.am
+++ b/jtag/src/tap/Makefile.am
@@ -58,12 +58,23 @@ endif
 
 if HAVE_LIBFTDI
 libtap_a_SOURCES += \
-	parport/ftdi.c \
-	cable/usbblaster.c \
-	cable/ft2232.c
+	parport/ftdi.c
 endif
 
 if HAVE_LIBFTD2XX
 libtap_a_SOURCES += \
 	parport/ftd2xx.c
 endif
+
+FTDIDEPENDENT= \
+	cable/usbblaster.c \
+	cable/ft2232.c
+
+if HAVE_LIBFTDI
+libtap_a_SOURCES += $(FTDIDEPENDENT)
+else
+if HAVE_LIBFTD2XX
+libtap_a_SOURCES += $(FTDIDEPENDENT)
+endif
+endif
+