diff --git a/configure b/configure
index 51fdf1d..42efbcc 100644
--- a/configure
+++ b/configure
@@ -16019,7 +16019,7 @@ fi
 fi
 
 
-pkg_modules="gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.4 gconf-2.0 >= 2.0 lcms dbus-1 exiv2 fftw3f lensfun libcurl flickcurl sqlite3 libssl libgphoto2 x11"
+pkg_modules="gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.4 gconf-2.0 >= 2.0 lcms2 dbus-1 exiv2 fftw3f lensfun libcurl flickcurl sqlite3 libssl libgphoto2 x11"
 
 
 
diff --git a/configure.in b/configure.in
index af707a8..b87343a 100644
--- a/configure.in
+++ b/configure.in
@@ -83,7 +83,7 @@ AC_CHECK_LIB(tiff, TIFFOpen, tiff_ok=yes, tiff_ok=no)
 fi
 AC_SUBST(LIBTIFF)
 
-pkg_modules="gthread-2.0 gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.4 gconf-2.0 >= 2.0 lcms dbus-1 exiv2 fftw3f lensfun libcurl flickcurl sqlite3 libssl libgphoto2 x11"
+pkg_modules="gthread-2.0 gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.4 gconf-2.0 >= 2.0 lcms2 dbus-1 exiv2 fftw3f lensfun libcurl flickcurl sqlite3 libssl libgphoto2 x11"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
diff --git a/plugins/load-dcraw/dcraw.cc b/plugins/load-dcraw/dcraw.cc
index a080442..c34e814 100644
--- a/plugins/load-dcraw/dcraw.cc
+++ b/plugins/load-dcraw/dcraw.cc
@@ -62,7 +62,7 @@ dcraw_api.h [1.42]
    NO_LCMS disables the "-p" option.
  */
 #ifndef NO_LCMS
-#include <lcms.h>
+#include <lcms2.h>
 #endif
 #ifdef HAVE_LIBJPEG
 extern "C" {
@@ -8267,7 +8267,7 @@ void CLASS apply_profile (const char *input, const char *output)
   FILE *fp;
   unsigned size;
 
-  cmsErrorAction (LCMS_ERROR_SHOW);
+//  cmsErrorAction (LCMS_ERROR_SHOW);
   if (strcmp (input, "embed"))
     hInProfile = cmsOpenProfileFromFile (input, "r");
   else if (profile_length) {
diff --git a/src/gtk-helper.c b/src/gtk-helper.c
index 2ef2177..1c5bff1 100644
--- a/src/gtk-helper.c
+++ b/src/gtk-helper.c
@@ -31,7 +31,7 @@
 #include "gtk-helper.h"
 #include "rs-preview-widget.h"
 #include <gettext.h>
-#include <lcms.h>
+#include <lcms2.h>
 
 struct _RS_CONFBOX
 {
diff --git a/plugins/colorspace-transform/colorspace_transform.c b/plugins/colorspace-transform/colorspace_transform.c
index c9a7633..6bc9390 100644
--- a/plugins/colorspace-transform/colorspace_transform.c
+++ b/plugins/colorspace-transform/colorspace_transform.c
@@ -20,7 +20,7 @@
 /* Plugin tmpl version 5 */
 
 #include <rawstudio.h>
-#include <lcms.h>
+#include <lcms2.h>
 #include "rs-cmm.h"
 #include "colorspace_transform.h"
 
diff --git a/plugins/colorspace-transform/colorspace_transform.h b/plugins/colorspace-transform/colorspace_transform.h
index 8728f48..32674b0 100644
--- a/plugins/colorspace-transform/colorspace_transform.h
+++ b/plugins/colorspace-transform/colorspace_transform.h
@@ -20,7 +20,7 @@
 /* Plugin tmpl version 5 */
 
 #include <rawstudio.h>
-#include <lcms.h>
+#include <lcms2.h>
 #include "rs-cmm.h"
 
 #define RS_TYPE_COLORSPACE_TRANSFORM (rs_colorspace_transform_type)
diff --git a/plugins/colorspace-transform/colorspace_transform_sse2.c b/plugins/colorspace-transform/colorspace_transform_sse2.c
index 53e9e0d..f94ad1b 100644
--- a/plugins/colorspace-transform/colorspace_transform_sse2.c
+++ b/plugins/colorspace-transform/colorspace_transform_sse2.c
@@ -20,7 +20,7 @@
 /* Plugin tmpl version 5 */
 
 #include <rawstudio.h>
-#include <lcms.h>
+#include <lcms2.h>
 #include "rs-cmm.h"
 #include "colorspace_transform.h"
 
diff --git a/plugins/colorspace-transform/rs-cmm.c b/plugins/colorspace-transform/rs-cmm.c
index 99f5456..c671f63 100644
--- a/plugins/colorspace-transform/rs-cmm.c
+++ b/plugins/colorspace-transform/rs-cmm.c
@@ -17,9 +17,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <lcms.h>
+#include <lcms2.h>
 #include "rs-cmm.h"
 
+
+#ifndef LCMS_WIN_TYPES_ALREADY_DEFINED
+typedef unsigned char BYTE, *LPBYTE;
+typedef unsigned short WORD, *LPWORD;
+typedef unsigned long DWORD, *LPDWORD;
+typedef char *LPSTR;
+typedef void *LPVOID;
+#endif
+
 static gushort gammatable22[65536];
 
 struct _RSCmm {
@@ -308,10 +308,12 @@ is_profile_gamma_22_corrected(cmsHPROFILE *profile)
 			{0.115, 0.826, 0.724938},
 			{0.157, 0.018, 0.016875}};
 		cmsCIExyY D65;
-		LPGAMMATABLE gamma[3];
 
-		cmsWhitePointFromTemp(6504, &D65);
-		gamma[0] = gamma[1] = gamma[2] = cmsBuildGamma(2,1.0);
+		gint context = 1337;
+		cmsToneCurve* gamma[3];
+		cmsWhitePointFromTemp(&D65, 6504);
+		gamma[0] = gamma[1] = gamma[2] = cmsBuildGamma(&context,1.0);
+
 		linear = cmsCreateRGBProfile(&D65, &srgb_primaries, gamma);
 	}
 	g_mutex_unlock(is_profile_gamma_22_corrected_linear_lock);
@@ -347,7 +349,7 @@ prepare16(RSCmm *cmm)
 	cmm->lcms_transform16 = cmsCreateTransform(
 		cmm->lcms_input_profile, TYPE_RGB_16,
 		cmm->lcms_output_profile, TYPE_RGB_16,
-		INTENT_PERCEPTUAL, 0);
+		INTENT_PERCEPTUAL, cmsFLAGS_NOCACHE);
 
 	g_warn_if_fail(cmm->lcms_transform16 != NULL);
 
-- 
2.0.5