diff --git a/avrdude/ChangeLog b/avrdude/ChangeLog
index 52b1d0f5..be0a9a30 100644
--- a/avrdude/ChangeLog
+++ b/avrdude/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-11 Joerg Wunsch <j@uriah.heep.sax.de>
+
+	* configure.ac (AC_CHECK_LIB([usb]): implement a private LIBUSB
+	macro to add this library to, to prevent it from being
+	automatically linked to all binaries.  This should fix the Win32
+	build of loaddrv.
+	* Makefile.am (avrdude_LDADD): add LIBUSB here.
+
 2006-08-10 Eric B. Weddington <eweddington@cso.atmel.com>
 
     Contributed by Bob Paddock <graceindustries@gmail.com>
diff --git a/avrdude/Makefile.am b/avrdude/Makefile.am
index 73912bc0..6d807f6f 100644
--- a/avrdude/Makefile.am
+++ b/avrdude/Makefile.am
@@ -47,6 +47,8 @@ avrdude_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\"
 
 avrdude_CFLAGS   = @ENABLE_WARNINGS@  
 
+avrdude_LDADD  = @LIBUSB@
+
 bin_PROGRAMS = avrdude
 
 avrdude_SOURCES = \
diff --git a/avrdude/configure.ac b/avrdude/configure.ac
index 1b3344ea..6145959a 100644
--- a/avrdude/configure.ac
+++ b/avrdude/configure.ac
@@ -46,7 +46,10 @@ AC_CHECK_LIB([ncurses], [tputs])
 AC_CHECK_LIB([readline], [readline])
 # usb_get_string_simple is only available in recent enough
 # versions of libusb, so use that as a decision base.
-AC_CHECK_LIB([usb], [usb_get_string_simple])
+AC_CHECK_LIB([usb], [usb_get_string_simple],
+		    [LIBUSB=-lusb],
+		    [LIBUSB=])
+AC_SUBST(LIBUSB, $LIBUSB)
 
 # Checks for header files.
 AC_HEADER_STDC