diff --git a/ChangeLog b/ChangeLog
index 4a816b4085..1fe03fad69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-10-23  Sven Neumann  <sven@gimp.org>
 
+	* configure.in: use LIBLCMS instead of LCMS_LIBS.
+
+	* modules/Makefile.am: changed accordingly.
+	
 	* plug-ins/common/mkgen.pl: link plug-ins with the same libraries
 	and in the same order as defined in the gimp.pc and gimpui.pc files.
 
diff --git a/configure.in b/configure.in
index d70c4afbad..822464a4ea 100644
--- a/configure.in
+++ b/configure.in
@@ -1322,7 +1322,7 @@ if test "x$with_lcms" != xno; then
       ])
   ])
   if test $have_lcms = yes; then
-    LCMS_LIBS="-llcms"
+    LIBLCMS="-llcms"
     LCMS='lcms$(EXEEXT)'
   else
     have_lcms="no (lcms not found or unusable)"
@@ -1332,7 +1332,7 @@ else
 fi
 
 AC_SUBST(LCMS)
-AC_SUBST(LCMS_LIBS)
+AC_SUBST(LIBLCMS)
 AM_CONDITIONAL(HAVE_LCMS, test $have_lcms = yes)
 
 
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 4b4444748c..2df8f4b6ca 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -50,7 +50,7 @@ controller_libadd = $(modules_libadd)
 
 if HAVE_LCMS
 libcolorsel_cmyk_la_SOURCES = colorsel_cmyk_lcms.c
-libcolorsel_cmyk_la_LIBADD = $(libgimpconfig) $(colorsel_libadd) $(LCMS_LIBS)
+libcolorsel_cmyk_la_LIBADD = $(libgimpconfig) $(colorsel_libadd) $(LIBLCMS)
 else
 libcolorsel_cmyk_la_SOURCES = colorsel_cmyk.c
 libcolorsel_cmyk_la_LIBADD = $(colorsel_libadd)
@@ -80,11 +80,11 @@ libcdisplay_highcontrast_la_LIBADD = $(cdisplay_libadd)
 
 libcdisplay_lcms_la_SOURCES = cdisplay_lcms.c
 libcdisplay_lcms_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libcdisplay_lcms_la_LIBADD = $(cdisplay_libadd) $(LCMS_LIBS)
+libcdisplay_lcms_la_LIBADD = $(cdisplay_libadd) $(LIBLCMS)
 
 libcdisplay_proof_la_SOURCES = cdisplay_proof.c
 libcdisplay_proof_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libcdisplay_proof_la_LIBADD = $(cdisplay_libadd) $(LCMS_LIBS)
+libcdisplay_proof_la_LIBADD = $(cdisplay_libadd) $(LIBLCMS)
 
 libcontroller_linux_input_la_SOURCES = controller_linux_input.c
 libcontroller_linux_input_la_LDFLAGS = -avoid-version -module $(no_undefined)