diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile
index 877e0c2d5f8..b23ef64e94a 100644
--- a/graphics/lcms/Makefile
+++ b/graphics/lcms/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2007/08/02 19:22:12 mbalmer Exp $
+# $OpenBSD: Makefile,v 1.14 2007/08/05 19:04:52 espie Exp $
 
 COMMENT=	"color management library"
 
-DISTNAME=	lcms-1.17
+DISTNAME=	lcms-1.15
 PKGNAME=	${DISTNAME}
-SHARED_LIBS=	lcms	2.0
+SHARED_LIBS=	lcms	1.15
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lcms/}
 
diff --git a/graphics/lcms/distinfo b/graphics/lcms/distinfo
index 135167a2e60..909dbdac0a8 100644
--- a/graphics/lcms/distinfo
+++ b/graphics/lcms/distinfo
@@ -1,5 +1,5 @@
-MD5 (lcms-1.17.tar.gz) = B727TPsF0hyqWP49HITdwQ==
-RMD160 (lcms-1.17.tar.gz) = GtZylbU6guSBMpTLzfzPilvbG70=
-SHA1 (lcms-1.17.tar.gz) = CD6wKJAEj4Q4A6WXSRTlS14DRJM=
-SHA256 (lcms-1.17.tar.gz) = XvO02rMJVncgCeKdujP+ElbPnaFhEGoecLCWbJbRRYM=
-SIZE (lcms-1.17.tar.gz) = 898816
+MD5 (lcms-1.15.tar.gz) = dskhlz/epPiAlEoCQZf5JA==
+RMD160 (lcms-1.15.tar.gz) = LNs4A5kxzTX1UOq6o0Id9rm/0OQ=
+SHA1 (lcms-1.15.tar.gz) = Rcq/TSUcAxsT/FYjmgbwCZIyCi4=
+SHA256 (lcms-1.15.tar.gz) = kw733hXrAowc2/4/EXCqodWwtNRaj6SW2UQhbhVRIsI=
+SIZE (lcms-1.15.tar.gz) = 777834
diff --git a/graphics/lcms/patches/patch-include_lcms_h b/graphics/lcms/patches/patch-include_lcms_h
index 2dad65232fa..fb63e2d3e4e 100644
--- a/graphics/lcms/patches/patch-include_lcms_h
+++ b/graphics/lcms/patches/patch-include_lcms_h
@@ -1,7 +1,7 @@
-$OpenBSD: patch-include_lcms_h,v 1.4 2007/08/02 19:22:12 mbalmer Exp $
---- include/lcms.h.orig	Fri Jul 27 12:00:01 2007
-+++ include/lcms.h	Tue Jul 31 14:42:02 2007
-@@ -161,11 +161,18 @@ typedef    pthread_rwlock_t      LCMS_RWLOCK_T;
+$OpenBSD: patch-include_lcms_h,v 1.5 2007/08/05 19:04:52 espie Exp $
+--- include/lcms.h.orig	Tue Mar  7 22:46:48 2006
++++ include/lcms.h	Tue Mar  7 22:47:46 2006
+@@ -131,11 +131,17 @@
  #   define USE_BIG_ENDIAN      1
  #endif
  
@@ -9,14 +9,13 @@ $OpenBSD: patch-include_lcms_h,v 1.4 2007/08/02 19:22:12 mbalmer Exp $
 +#if defined(__NetBSD__) || defined(__FreeBSD__)
  #  include <sys/types.h>
  #  define USE_INT64           1
- #  define LCMSSLONGLONG       int64_t
+ #  define LCMSSLONGLONG       int_64_t
  #  define LCMSULONGLONG       u_int64_t
 +#endif
-+
 +#if defined(__OpenBSD__)
 +#  include <stdint.h>
 +#  define USE_INT64           1
-+#  define LCMSSLONGLONG       int64_t
++#  define LCMSSLONGLONG	      int64_t
 +#  define LCMSULONGLONG       uint64_t
  #endif
  
diff --git a/graphics/lcms/patches/patch-samples_Makefile_in b/graphics/lcms/patches/patch-samples_Makefile_in
index b9dd11efc0d..652d5c5957e 100644
--- a/graphics/lcms/patches/patch-samples_Makefile_in
+++ b/graphics/lcms/patches/patch-samples_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-samples_Makefile_in,v 1.3 2007/08/02 19:22:12 mbalmer Exp $
---- samples/Makefile.in.orig	Fri Jul 27 12:10:45 2007
-+++ samples/Makefile.in	Tue Jul 31 14:40:05 2007
-@@ -250,17 +250,17 @@ top_srcdir = @top_srcdir@
+$OpenBSD: patch-samples_Makefile_in,v 1.4 2007/08/05 19:04:52 espie Exp $
+--- samples/Makefile.in.orig	Tue Nov  1 01:13:40 2005
++++ samples/Makefile.in	Tue Mar  7 22:42:42 2006
+@@ -243,17 +243,17 @@ target_vendor = @target_vendor@
  # Don't require all the GNU mandated files
  AUTOMAKE_OPTIONS = 1.7 foreign
  AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
diff --git a/graphics/lcms/patches/patch-src_Makefile_in b/graphics/lcms/patches/patch-src_Makefile_in
index 3c02d7ddfe3..68cb7973394 100644
--- a/graphics/lcms/patches/patch-src_Makefile_in
+++ b/graphics/lcms/patches/patch-src_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_Makefile_in,v 1.4 2007/08/02 19:22:12 mbalmer Exp $
---- src/Makefile.in.orig	Fri Jul 27 12:10:45 2007
-+++ src/Makefile.in	Tue Jul 31 14:40:05 2007
-@@ -240,7 +240,7 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/i
+$OpenBSD: patch-src_Makefile_in,v 1.5 2007/08/05 19:04:52 espie Exp $
+--- src/Makefile.in.orig	Tue Nov  1 01:13:40 2005
++++ src/Makefile.in	Tue Mar  7 22:43:15 2006
+@@ -242,7 +242,7 @@ INCLUDES = -I$(top_builddir)/include -I$
  liblcms_la_LDFLAGS = -no-undefined \
    -version-info $(LIBRARY_CURRENT):$(LIBRARY_REVISION):$(LIBRARY_AGE)
  
diff --git a/graphics/lcms/patches/patch-src_cmsmtrx_c b/graphics/lcms/patches/patch-src_cmsmtrx_c
index ae29129b999..240ff6130a2 100644
--- a/graphics/lcms/patches/patch-src_cmsmtrx_c
+++ b/graphics/lcms/patches/patch-src_cmsmtrx_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_cmsmtrx_c,v 1.3 2007/08/02 19:22:12 mbalmer Exp $
---- src/cmsmtrx.c.orig	Fri Jul 27 12:00:02 2007
-+++ src/cmsmtrx.c	Tue Jul 31 14:40:05 2007
-@@ -799,9 +799,9 @@ void MAT3fromFix(LPMAT3 r, LPWMAT3 v)
+$OpenBSD: patch-src_cmsmtrx_c,v 1.4 2007/08/05 19:04:52 espie Exp $
+--- src/cmsmtrx.c.orig	Fri Nov 25 12:11:16 2005
++++ src/cmsmtrx.c	Tue Mar  7 22:36:36 2006
+@@ -797,9 +797,9 @@ void MAT3fromFix(LPMAT3 r, LPWMAT3 v)
  
  void VEC3scaleAndCut(LPWVEC3 r, LPVEC3 v, double d)
  {
diff --git a/graphics/lcms/patches/patch-testbed_Makefile_in b/graphics/lcms/patches/patch-testbed_Makefile_in
index b3eac2def28..a2779fe421c 100644
--- a/graphics/lcms/patches/patch-testbed_Makefile_in
+++ b/graphics/lcms/patches/patch-testbed_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-testbed_Makefile_in,v 1.3 2007/08/02 19:22:12 mbalmer Exp $
---- testbed/Makefile.in.orig	Fri Jul 27 12:10:45 2007
-+++ testbed/Makefile.in	Tue Jul 31 14:40:05 2007
-@@ -220,7 +220,7 @@ top_srcdir = @top_srcdir@
+$OpenBSD: patch-testbed_Makefile_in,v 1.4 2007/08/05 19:04:52 espie Exp $
+--- testbed/Makefile.in.orig	Tue Nov  1 01:13:40 2005
++++ testbed/Makefile.in	Tue Mar  7 22:43:47 2006
+@@ -222,7 +222,7 @@ target_vendor = @target_vendor@
  # Don't require all the GNU mandated files
  AUTOMAKE_OPTIONS = 1.7 foreign
  INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include