diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 8d192dd2..847f00e5 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -2,6 +2,8 @@
 
    * configure.ac: Check for libusb before libftdi since the latter needs
      the former.
+   * configure.ac: Use AC_PATH_TOOL() instead of AC_PATH_PROG() so that we
+     handle cross-compiling sanely.
 
 2008-04-26  Kolja Waschk <kawk>
 
diff --git a/jtag/configure.ac b/jtag/configure.ac
index a4f80edc..ca998077 100644
--- a/jtag/configure.ac
+++ b/jtag/configure.ac
@@ -133,7 +133,7 @@ AS_IF([test "x$with_libusb" != xno], [
     esac
     LIBS="$LIBS -lusb"
   ],[
-    AC_PATH_PROG(LIBUSB_CONFIG, libusb-config, no) 
+    AC_PATH_TOOL(LIBUSB_CONFIG, libusb-config, no) 
     AS_IF([test "$LIBUSB_CONFIG" != "no"],[
       USBLIBS=`$LIBUSB_CONFIG --libs`
       USBCFLAGS=`$LIBUSB_CONFIG --cflags`
@@ -172,7 +172,7 @@ AS_IF([test "x$with_libftdi" != xno], [
     CFLAGS="$CFLAGS -I$with_libftdi -L$with_libftdi"
     LIBS="$LIBS -lftdi"
   ],[
-    AC_PATH_PROG(LIBFTDI_CONFIG, libftdi-config, no) 
+    AC_PATH_TOOL(LIBFTDI_CONFIG, libftdi-config, no) 
     AS_IF([test "$LIBFTDI_CONFIG" != "no"],[
       LIBS="$LIBS `$LIBFTDI_CONFIG --libs`"
       CFLAGS="$CFLAGS `$LIBFTDI_CONFIG --cflags`"