diff --git a/ChangeLog b/ChangeLog
index 176934e394..e3c1f4a4b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-21  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: if lcms.h cannot be found, try lcms/lcms.h.
+
+	* modules/cdisplay_proof.c: changed accordingly.
+
 2003-11-21  Jakub Steiner <jimmac@ximian.com>
 
 	* themes/Default/images/preferences/window-manager.png: use
diff --git a/configure.in b/configure.in
index e53a1b15da..40a99c53c6 100644
--- a/configure.in
+++ b/configure.in
@@ -1044,7 +1044,13 @@ have_lcms=no
 AC_CHECK_LIB(lcms, cmsCreateProofingTransform, [
   AC_CHECK_HEADER(lcms.h,
     have_lcms=yes
-    LCMS_LIBS="-llcms")])
+    LCMS_LIBS="-llcms", [
+    AC_CHECK_HEADER(lcms/lcms.h,
+      have_lcms=yes
+      AC_DEFINE(HAVE_LCMS_LCMS_H, 1,
+        [Define to 1 if the lcms header must be included as lcms/lcms.h])
+      LCMS_LIBS="-llcms")])
+])
 
 AC_SUBST(LCMS_LIBS)
 AM_CONDITIONAL(HAVE_LCMS, test $have_lcms = yes)
diff --git a/modules/cdisplay_proof.c b/modules/cdisplay_proof.c
index ff2d9b494c..0d2e5b4130 100644
--- a/modules/cdisplay_proof.c
+++ b/modules/cdisplay_proof.c
@@ -18,9 +18,13 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <string.h>
+
+#ifdef HAVE_LCMS_LCMS_H
+#include <lcms/lcms.h>
+#else
 #include <lcms.h>
+#endif
 
 #include <gtk/gtk.h>