diff --git a/libgphoto2_port/ChangeLog b/libgphoto2_port/ChangeLog
index 8166542d9..8deda3629 100644
--- a/libgphoto2_port/ChangeLog
+++ b/libgphoto2_port/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-26  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+
+	* configure.in: Fix typo (USB_LIBS, not USB_LDFLAGS) *sigh*
+	* usb/Makefile.am: libgphoto2-port-usb.so needs -lusb, therefore add
+	  it using LIBADD (ldopen is not clever enough to figure that out).
+
 2001-11-25  Lutz Müller <urc8@rz.uni-karlsruhe.de>
 
 	* gphoto2-port-config.in: Remove another reference to IOLIB_CFLAGS...
diff --git a/libgphoto2_port/configure.in b/libgphoto2_port/configure.in
index d1d3cbd95..7a16c08f3 100644
--- a/libgphoto2_port/configure.in
+++ b/libgphoto2_port/configure.in
@@ -74,13 +74,6 @@ AC_TRY_COMPILE([#include <ioctl-types.h>], [int foo = TIOCM_RTS;],
 AC_TRY_COMPILE([#include <sys/ioctl.h>], [int foo = TIOCM_RTS;],
 			AC_DEFINE(HAVE_RTS_IOCTL))
 
-GPPORT_LIBDIR='-L${libdir}'
-GPPORT_INCLUDEDIR='-I${includedir}/gphoto2'
-GPPORT_LIBS="-lgphoto2_port"
-AC_SUBST(GPPORT_LIBDIR)
-AC_SUBST(GPPORT_LIBS)
-AC_SUBST(GPPORT_INCLUDEDIR)
-
 dnl ******
 dnl serial
 dnl ******
@@ -194,7 +187,7 @@ if $try_usb; then
 		AC_CHECK_HEADER(usb.h,
 			usb_msg=yes
 			IOLIB_SUBDIRS="$IOLIB_SUBDIRS usb"
-			USB_LDFLAGS="`libusb-config --libs` -lgphoto2_port_usb"
+			USB_LIBS="`libusb-config --libs`"
 			USB_CFLAGS="`libusb-config --cflags`",
 			AC_MSG_WARN([
 *** You need the libusb library for USB support
@@ -218,6 +211,13 @@ AC_SUBST(USB_LIBS)
 
 AC_SUBST(IOLIB_SUBDIRS)
 
+GPPORT_LIBDIR='-L${libdir}'
+GPPORT_INCLUDEDIR='-I${includedir}/gphoto2'
+GPPORT_LIBS="-lgphoto2_port"
+AC_SUBST(GPPORT_LIBDIR)
+AC_SUBST(GPPORT_LIBS)
+AC_SUBST(GPPORT_INCLUDEDIR)
+
 dnl ********
 dnl gtk-doc?
 dnl ********
diff --git a/libgphoto2_port/usb/Makefile.am b/libgphoto2_port/usb/Makefile.am
index 17160c6d8..7e1b3892c 100644
--- a/libgphoto2_port/usb/Makefile.am
+++ b/libgphoto2_port/usb/Makefile.am
@@ -4,5 +4,6 @@ INCLUDES = -I$(top_srcdir) $(USB_CFLAGS)
 ## Compile the IO library into a shared library
 iolibdir = $(prefix)/lib/gphoto2_port
 iolib_LTLIBRARIES = libgphoto2_port_usb.la
-libgphoto2_port_usb_la_LDFLAGS = -module -avoid-version $(USB_LIBS)
+libgphoto2_port_usb_la_LDFLAGS = -module -avoid-version
+libgphoto2_port_usb_la_LIBADD = $(USB_LIBS)
 libgphoto2_port_usb_la_SOURCES = libusb.c