diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10a99306..7bc46e23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -324,7 +324,7 @@ ENDIF()
  IF(LCMS2_FOUND)
   SET(LCMS12_MISSING 0)
   SET(HAVE_LCMS2_H 1)
-  SET(HAVE_LCMS2_LIB 1)
+  SET(HAVE_LIBLCMS2 1)
   SET(LCMS_LIBNAME ${LCMS2_LIBRARY})
   SET(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIR})
  ENDIF(LCMS2_FOUND)
@@ -334,9 +334,9 @@ ENDIF()
 #
   IF(LCMS_FOUND)
    SET(LCMS12_MISSING 0)
-   SET(HAVE_LCMS_H 1)
-    SET(HAVE_LCMS_LIB 1)
-    SET(LCMS_LIBNAME ${LCMS_LIBRARRY} )
+   SET(HAVE_LCMS1_H 1)
+    SET(HAVE_LIBLCMS1 1)
+    SET(LCMS_LIBNAME ${LCMS_LIBRARY} )
     SET(LCMS_INCLUDE_DIRNAME ${LCMS_INCLUDE_DIR})
   ENDIF(LCMS_FOUND)
  ENDIF(NOT LCMS2_FOUND)
diff --git a/opj_configh.cmake.in b/opj_configh.cmake.in
index d5145346..f510a710 100644
--- a/opj_configh.cmake.in
+++ b/opj_configh.cmake.in
@@ -15,8 +15,8 @@
 #cmakedefine HAVE_LIBTIFF @HAVE_LIBTIFF@
 #cmakedefine HAVE_TIFF_H @HAVE_TIFF_H@
 #
-#cmakedefine HAVE_LIBLCMS1 @HAVE_LCMS1_LIB@
-#cmakedefine HAVE_LIBLCMS2 @HAVE_LCMS2_LIB@
+#cmakedefine HAVE_LIBLCMS1 @HAVE_LIBLCMS1@
+#cmakedefine HAVE_LIBLCMS2 @HAVE_LIBLCMS2@
 #cmakedefine HAVE_LCMS1_H @HAVE_LCMS1_H@
 #cmakedefine HAVE_LCMS2_H @HAVE_LCMS2_H@
 #