diff --git a/ChangeLog b/ChangeLog
index 9f2c5e053..9a89b223f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* doc/descriptions/unsupported.desc: Updates for Canon
 	  scanners. Added Spot scanners.
+	* aclocal.m4 acinclude.m4 configure: Fixed MacOS X build (patch
+	  from Mattias Ellert <mattias.ellert@tsl.uu.se>).
 
 2003-05-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
 
diff --git a/acinclude.m4 b/acinclude.m4
index e19698c1f..099929231 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -112,7 +112,7 @@ AC_DEFUN([SANE_SET_LDFLAGS],
       LDFLAGS="$LDFLAGS -Wl,-brtl"
       ;;
     darwin*) #include frameworks
-      LDFLAGS="$LDFLAGS -framework CoreFoundation -framework IOKit"
+      LIBS="$LIBS -framework CoreFoundation -framework IOKit"
       ;;
   esac
 ])
diff --git a/aclocal.m4 b/aclocal.m4
index 1c0fe737c..b80621d3e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -124,7 +124,7 @@ AC_DEFUN([SANE_SET_LDFLAGS],
       LDFLAGS="$LDFLAGS -Wl,-brtl"
       ;;
     darwin*) #include frameworks
-      LDFLAGS="$LDFLAGS -framework CoreFoundation -framework IOKit"
+      LIBS="$LIBS -framework CoreFoundation -framework IOKit"
       ;;
   esac
 ])
diff --git a/configure b/configure
index f992d98fa..6b132ba32 100755
--- a/configure
+++ b/configure
@@ -3283,7 +3283,7 @@ fi # ac_cv_c_compiler_gnu
       LDFLAGS="$LDFLAGS -Wl,-brtl"
       ;;
     darwin*) #include frameworks
-      LDFLAGS="$LDFLAGS -framework CoreFoundation -framework IOKit"
+      LIBS="$LIBS -framework CoreFoundation -framework IOKit"
       ;;
   esac