diff --git a/ChangeLog b/ChangeLog
index b5f157815..8d0a7f7bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-28 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
+	* acinclude.m4, tools/sane-config.in: Add in missing libraries
+	to sane-config missed during fix to stop using LIBS to link everything.
+	Add back in code to move LDFLAGS out of $GPHOTO2_LIBS and into
+	GPHOTO2_LDFLAGS.
+
 2009-03-02 Stéphane Voltz <stef.dev@free.fr>
 	* backend/genesys_devices.c, backend/genesys_gl646.c: fix 400, 1200
 	and 2400 dpi scan modes for MD5345/MD6471
diff --git a/Makefile.in b/Makefile.in
index 664fd5b94..c8a58a5cb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -123,6 +123,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
+GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@
 GREP = @GREP@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
diff --git a/acinclude.m4 b/acinclude.m4
index d0eda2d4c..77ea71b37 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -4,6 +4,7 @@ dnl   SANE_SET_CFLAGS(is_release)
 dnl   SANE_CHECK_MISSING_HEADERS
 dnl   SANE_SET_LDFLAGS
 dnl   SANE_CHECK_DLL_LIB
+dnl   SANE_EXTRACT_LDFLAGS(LIBS, LDFLAGS)
 dnl   SANE_CHECK_JPEG
 dnl   SANE_CHECK_IEEE1284
 dnl   SANE_CHECK_PTHREAD
@@ -168,6 +169,31 @@ AC_DEFUN([SANE_CHECK_DLL_LIB],
   AC_SUBST(DYNAMIC_FLAG)
 ])
 
+#
+# Separate LIBS from LDFLAGS to link correctly on HP/UX (and other
+# platforms who care about the order of params to ld.  It removes all
+# non '-l..'-params from passed in $1(LIBS), and appends them to $2(LDFLAGS).
+#
+# Use like this: SANE_EXTRACT_LDFLAGS(PKGNAME_LIBS, PKGNAME_LDFLAGS)
+ AC_DEFUN([SANE_EXTRACT_LDFLAGS],
+[
+    tmp_LIBS=""
+    for param in ${$1}; do
+        case "${param}" in
+	-l*)
+         tmp_LIBS="${tmp_LIBS} ${param}"
+	 ;;
+	 *)
+         $2="${$2} ${param}"
+	 ;;
+	 esac
+     done
+     $1="${tmp_LIBS}"
+     unset tmp_LIBS
+     unset param
+])
+
+#
 #
 # Checks for ieee1284 library, needed for canon_pp backend.
 AC_DEFUN([SANE_CHECK_IEEE1284],
@@ -389,48 +415,49 @@ AC_CHECK_TYPES([u_char, u_int, u_long],,,)
 # Checks for gphoto2 libs, needed by gphoto2 backend
 AC_DEFUN([SANE_CHECK_GPHOTO2],
 [
-	AC_ARG_WITH(gphoto2,
-	  AC_HELP_STRING([--with-gphoto2],
-                         [include the gphoto2 backend @<:@default=yes@:>@]),
-              [# If --with-gphoto2=no or --without-gphoto2, disable backend
+  AC_ARG_WITH(gphoto2,
+	      AC_HELP_STRING([--with-gphoto2],
+			     [include the gphoto2 backend @<:@default=yes@:>@]),
+	      [# If --with-gphoto2=no or --without-gphoto2, disable backend
                # as "$with_gphoto2" will be set to "no"])
 
-	# If --with-gphoto2=yes (or not supplied), first check if 
-	# pkg-config exists, then use it to check if libgphoto2 is
-	# present.  If all that works, then see if we can actually link
-        # a program.   And, if that works, then add the -l flags to 
-	# LIBS and any other flags to GPHOTO2_LDFLAGS to pass to 
-	# sane-config.
-	if test "$with_gphoto2" != "no" ; then 
-		AC_CHECK_TOOL(HAVE_GPHOTO2, pkg-config, false)
-	
+  # If --with-gphoto2=yes (or not supplied), first check if 
+  # pkg-config exists, then use it to check if libgphoto2 is
+  # present.  If all that works, then see if we can actually link
+  # a program.   And, if that works, then add the -l flags to 
+  # GPHOTO2_LIBS and any other flags to GPHOTO2_LDFLAGS to pass to 
+  # sane-config.
+  if test "$with_gphoto2" != "no" ; then 
+    AC_CHECK_TOOL(HAVE_GPHOTO2, pkg-config, false)
+
     if test ${HAVE_GPHOTO2} != "false" ; then
-			if pkg-config --exists libgphoto2 ; then
+      if pkg-config --exists libgphoto2 ; then
         with_gphoto2="`pkg-config --modversion libgphoto2`"
-        GPHOTO2_CPPFLAGS="`pkg-config --cflags libgphoto2`"
-				GPHOTO2_LIBS="`pkg-config --libs libgphoto2`"
+	GPHOTO2_CPPFLAGS="`pkg-config --cflags libgphoto2`"
+        GPHOTO2_LIBS="`pkg-config --libs libgphoto2`"
 
         saved_CPPFLAGS="${CPPFLAGS}"
         CPPFLAGS="${GPHOTO2_CPPFLAGS}"
-			 	saved_LIBS="${LIBS}"
-				LIBS="${LIBS} ${GPHOTO2_LIBS}"
-				# Make sure we an really use the library
-        AC_CHECK_FUNCS(gp_camera_init,
-                       HAVE_GPHOTO2=true, 
-                       HAVE_GPHOTO2=false)
-        CPPFLAGS="${saved_CPPFLAGS}"
+	saved_LIBS="${LIBS}"
+	LIBS="${LIBS} ${GPHOTO2_LIBS}"
+ 	# Make sure we an really use the library
+        AC_CHECK_FUNCS(gp_camera_init, HAVE_GPHOTO2=true, HAVE_GPHOTO2=false)
+	CPPFLAGS="${saved_CPPFLAGS}"
         LIBS="${saved_LIBS}"
-			else
-				HAVE_GPHOTO2=false
-			fi
+      else
+        HAVE_GPHOTO2=false
+      fi
       if test "${HAVE_GPHOTO2}" = "false"; then
         GPHOTO2_CPPFLAGS="" 
         GPHOTO2_LIBS="" 
-		fi
-	fi
+      else
+        SANE_EXTRACT_LDFLAGS(GPHOTO2_LIBS, GPHOTO2_LDFLAGS)
+      fi
+    fi
   fi
   AC_SUBST(GPHOTO2_CPPFLAGS)
   AC_SUBST(GPHOTO2_LIBS)
+  AC_SUBST(GPHOTO2_LDFLAGS)
 ])
 
 #
diff --git a/backend/Makefile.in b/backend/Makefile.in
index e5eecd79f..b647a908c 100644
--- a/backend/Makefile.in
+++ b/backend/Makefile.in
@@ -1357,6 +1357,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
+GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@ 
 GREP = @GREP@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
diff --git a/configure b/configure
index 7805f2259..ae3d1fdc2 100755
--- a/configure
+++ b/configure
@@ -840,6 +840,7 @@ AVAHI_LIBS
 AVAHI_CFLAGS
 LIBV4L_LIBS
 LIBV4L_CFLAGS
+GPHOTO2_LDFLAGS
 GPHOTO2_LIBS
 GPHOTO2_CPPFLAGS
 HAVE_GPHOTO2
@@ -11882,14 +11883,14 @@ if test "${with_gphoto2+set}" = set; then
 fi
 
 
-	# If --with-gphoto2=yes (or not supplied), first check if
-	# pkg-config exists, then use it to check if libgphoto2 is
-	# present.  If all that works, then see if we can actually link
-        # a program.   And, if that works, then add the -l flags to
-	# LIBS and any other flags to GPHOTO2_LDFLAGS to pass to
-	# sane-config.
-	if test "$with_gphoto2" != "no" ; then
-		if test -n "$ac_tool_prefix"; then
+  # If --with-gphoto2=yes (or not supplied), first check if
+  # pkg-config exists, then use it to check if libgphoto2 is
+  # present.  If all that works, then see if we can actually link
+  # a program.   And, if that works, then add the -l flags to
+  # GPHOTO2_LIBS and any other flags to GPHOTO2_LDFLAGS to pass to
+  # sane-config.
+  if test "$with_gphoto2" != "no" ; then
+    if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -11983,16 +11984,16 @@ fi
 
 
     if test ${HAVE_GPHOTO2} != "false" ; then
-			if pkg-config --exists libgphoto2 ; then
+      if pkg-config --exists libgphoto2 ; then
         with_gphoto2="`pkg-config --modversion libgphoto2`"
-        GPHOTO2_CPPFLAGS="`pkg-config --cflags libgphoto2`"
-				GPHOTO2_LIBS="`pkg-config --libs libgphoto2`"
+	GPHOTO2_CPPFLAGS="`pkg-config --cflags libgphoto2`"
+        GPHOTO2_LIBS="`pkg-config --libs libgphoto2`"
 
         saved_CPPFLAGS="${CPPFLAGS}"
         CPPFLAGS="${GPHOTO2_CPPFLAGS}"
-			 	saved_LIBS="${LIBS}"
-				LIBS="${LIBS} ${GPHOTO2_LIBS}"
-				# Make sure we an really use the library
+	saved_LIBS="${LIBS}"
+	LIBS="${LIBS} ${GPHOTO2_LIBS}"
+ 	# Make sure we an really use the library
 
 for ac_func in gp_camera_init
 do
@@ -12096,16 +12097,33 @@ else
 fi
 done
 
-        CPPFLAGS="${saved_CPPFLAGS}"
+	CPPFLAGS="${saved_CPPFLAGS}"
         LIBS="${saved_LIBS}"
-			else
-				HAVE_GPHOTO2=false
-			fi
+      else
+        HAVE_GPHOTO2=false
+      fi
       if test "${HAVE_GPHOTO2}" = "false"; then
         GPHOTO2_CPPFLAGS=""
         GPHOTO2_LIBS=""
-		fi
-	fi
+      else
+
+    tmp_LIBS=""
+    for param in ${GPHOTO2_LIBS}; do
+        case "${param}" in
+	-l*)
+         tmp_LIBS="${tmp_LIBS} ${param}"
+	 ;;
+	 *)
+         GPHOTO2_LDFLAGS="${GPHOTO2_LDFLAGS} ${param}"
+	 ;;
+	 esac
+     done
+     GPHOTO2_LIBS="${tmp_LIBS}"
+     unset tmp_LIBS
+     unset param
+
+      fi
+    fi
   fi
 
 
@@ -12113,6 +12131,7 @@ done
 
 
 
+
 pkg_failed=no
 { $as_echo "$as_me:$LINENO: checking for LIBV4L" >&5
 $as_echo_n "checking for LIBV4L... " >&6; }
@@ -18652,7 +18671,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 18655 "configure"' > conftest.$ac_ext
+  echo '#line 18674 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -21532,11 +21551,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:21535: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:21554: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:21539: \$? = $ac_status" >&5
+   echo "$as_me:21558: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -21822,11 +21841,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:21825: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:21844: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:21829: \$? = $ac_status" >&5
+   echo "$as_me:21848: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -21926,11 +21945,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:21929: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:21948: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:21933: \$? = $ac_status" >&5
+   echo "$as_me:21952: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -24328,7 +24347,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 24331 "configure"
+#line 24350 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -24428,7 +24447,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 24431 "configure"
+#line 24450 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -26841,11 +26860,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:26844: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:26863: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:26848: \$? = $ac_status" >&5
+   echo "$as_me:26867: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -26945,11 +26964,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:26948: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:26967: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:26952: \$? = $ac_status" >&5
+   echo "$as_me:26971: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -28530,11 +28549,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:28533: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:28552: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:28537: \$? = $ac_status" >&5
+   echo "$as_me:28556: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -28634,11 +28653,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:28637: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:28656: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:28641: \$? = $ac_status" >&5
+   echo "$as_me:28660: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -30855,11 +30874,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:30858: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:30877: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:30862: \$? = $ac_status" >&5
+   echo "$as_me:30881: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -31145,11 +31164,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:31148: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:31167: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:31152: \$? = $ac_status" >&5
+   echo "$as_me:31171: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -31249,11 +31268,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:31252: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:31271: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:31256: \$? = $ac_status" >&5
+   echo "$as_me:31275: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
diff --git a/doc/Makefile.in b/doc/Makefile.in
index f186a5280..3986c6db6 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -116,6 +116,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
+GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@
 GREP = @GREP@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
diff --git a/frontend/Makefile.in b/frontend/Makefile.in
index db939fe79..db7178ccd 100644
--- a/frontend/Makefile.in
+++ b/frontend/Makefile.in
@@ -128,6 +128,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
+GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@
 GREP = @GREP@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
diff --git a/include/Makefile.in b/include/Makefile.in
index 88e192bb7..fde92dacf 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -99,6 +99,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
+GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@
 GREP = @GREP@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
diff --git a/japi/Makefile.in b/japi/Makefile.in
index 5ea2be1b2..8ff2622da 100644
--- a/japi/Makefile.in
+++ b/japi/Makefile.in
@@ -121,6 +121,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
+GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@
 GREP = @GREP@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 6a6f0505c..7ed9f8a5d 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -110,6 +110,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
+GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@
 GREP = @GREP@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
diff --git a/po/Makefile.in b/po/Makefile.in
index 43b609530..6836fb7f9 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -88,6 +88,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
+GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@
 GREP = @GREP@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
diff --git a/sanei/Makefile.in b/sanei/Makefile.in
index e0a392955..ae956b42d 100644
--- a/sanei/Makefile.in
+++ b/sanei/Makefile.in
@@ -124,6 +124,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
+GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@
 GREP = @GREP@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 5dc83303d..371eb7e86 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -86,6 +86,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
+GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@
 GREP = @GREP@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 0b0ffaf81..93c3459a4 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -126,6 +126,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
+GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@
 GREP = @GREP@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
diff --git a/tools/sane-config.in b/tools/sane-config.in
index 92ecaf9ba..ad1d1e0ae 100644
--- a/tools/sane-config.in
+++ b/tools/sane-config.in
@@ -12,7 +12,7 @@ LINKER_RPATH="@LINKER_RPATH@"
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 
-LIBS="@LIBS@ @DL_LIB@"
+LIBS="@LIBS@ @DL_LIBS@ @LIBV4L_LIBS@ @MATH_LIB@ @TIFF_LIBS@ @JPEG_LIBS@ @GPHOTO2_LIBS@ @SOCKET_LIBS@ @AVAHI_LIBS@ @USB_LIBS@ @SCSI_LIBS@"
 pkgincludedir="@pkgincludedir@"
 pkglibdir="@pkglibdir@"
 includedir="@includedir@"
@@ -86,9 +86,9 @@ if test $# -gt 0; then
     --ldflags)
 
       if test -z "$LINKER_RPATH"; then
-        echo "-L${libdir} @GPHOTO2_LDFLAGS@"
+        echo "-L${libdir}"
       else
-        echo "-L${libdir} @GPHOTO2_LDFLAGS@ ${LINKER_RPATH}${libdir}"
+        echo "-L${libdir}${LINKER_RPATH}${libdir}"
       fi
       ;;
     --libs)