diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile
index e728ab0df51..0abeded08f9 100644
--- a/graphics/colord/Makefile
+++ b/graphics/colord/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2012/01/09 16:28:25 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2012/03/19 08:59:00 ajacoutot Exp $
 
 COMMENT=	device color profile management daemon
 
-DISTNAME=	colord-0.1.15
+DISTNAME=	colord-0.1.18
 EXTRACT_SUFX=	.tar.xz
 
 SHARED_LIBS +=  colord               0.0      # 1.4
@@ -20,8 +20,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB += c ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
-WANTLIB += jpeg lcms2 m pcre polkit-gobject-1 pthread sane sqlite3
-WANTLIB += tiff usb usb-1.0 z
+WANTLIB += lcms2 m pcre polkit-gobject-1 pthread sqlite3 z
 
 MASTER_SITES=	http://www.freedesktop.org/software/colord/releases/
 
@@ -32,9 +31,7 @@ BUILD_DEPENDS=	lang/vala \
 		devel/gobject-introspection \
 		textproc/docbook2x
 
-LIB_DEPENDS=	devel/libusb1 \
-		graphics/sane-backends \
-		sysutils/polkit \
+LIB_DEPENDS=	sysutils/polkit \
 		graphics/lcms2
 
 # technically not needed, however it is handy to have some profiles to
@@ -52,7 +49,9 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--enable-introspection \
 		--disable-gtk-doc \
 		--disable-reverse \
-		--disable-gudev
+		--disable-gudev \
+		--with-daemon-user=_colord \
+		--disable-sane # needs gudev
 
 FAKE_FLAGS=	sysconfdir="${PREFIX}/share/examples/colord"
 
@@ -68,5 +67,9 @@ pre-configure:
 
 post-install:
 	rm -rf ${WRKINST}/lib ${PREFIX}/var
+	# needs gudev
+	rm ${PREFIX}/share/examples/colord/dbus-1/system.d/org.freedesktop.colord-sane.conf \
+		${PREFIX}/share/dbus-1/system-services/org.freedesktop.colord-sane.service \
+		${PREFIX}/share/dbus-1/interfaces/org.freedesktop.colord.sane.xml
 
 .include <bsd.port.mk>
diff --git a/graphics/colord/distinfo b/graphics/colord/distinfo
index f3f48b35ad8..f67a0f36031 100644
--- a/graphics/colord/distinfo
+++ b/graphics/colord/distinfo
@@ -1,5 +1,5 @@
-MD5 (colord-0.1.15.tar.xz) = 8hLLx+7OP6QDwVB/yLENuw==
-RMD160 (colord-0.1.15.tar.xz) = HM2L4UECUuIaJug7BkYqwd7xuVM=
-SHA1 (colord-0.1.15.tar.xz) = 6DpordP6ycZ3gpkleU7jU3Q9ycg=
-SHA256 (colord-0.1.15.tar.xz) = 3/VkduAlJ4mfSiw57rCSrzaatdrB4hy7alsJVbXG50Y=
-SIZE (colord-0.1.15.tar.xz) = 456776
+MD5 (colord-0.1.18.tar.xz) = jJv1RzPphiVEhg8aipph+Q==
+RMD160 (colord-0.1.18.tar.xz) = jurmofcV30UccmfrDhR7KZuQmQ4=
+SHA1 (colord-0.1.18.tar.xz) = YSfnI6m+uTKq56Q7bmtf24TDlhE=
+SHA256 (colord-0.1.18.tar.xz) = hxdfm7wsWfvgG7mcSYk5P1qqtQd9p82R8JnGrsSeEJk=
+SIZE (colord-0.1.18.tar.xz) = 475220
diff --git a/graphics/colord/patches/patch-configure b/graphics/colord/patches/patch-configure
index 6d4a9b59e47..57f67da3883 100644
--- a/graphics/colord/patches/patch-configure
+++ b/graphics/colord/patches/patch-configure
@@ -1,12 +1,12 @@
-$OpenBSD: patch-configure,v 1.2 2012/01/09 16:28:25 ajacoutot Exp $
+$OpenBSD: patch-configure,v 1.3 2012/03/19 08:59:00 ajacoutot Exp $
 
 Fix DATADIRNAME: see LOCALBASE/share/aclocal/glib-gettext.m4.
 
 /var/lib -> /var/db
 
---- configure.orig	Sat Nov 26 09:38:57 2011
-+++ configure	Mon Jan  9 17:23:43 2012
-@@ -13419,6 +13419,9 @@ else
+--- configure.orig	Thu Mar 15 12:13:39 2012
++++ configure	Sun Mar 18 20:28:58 2012
+@@ -13555,6 +13555,9 @@ else
  fi
  
      ;;
@@ -16,12 +16,12 @@ Fix DATADIRNAME: see LOCALBASE/share/aclocal/glib-gettext.m4.
      *)
      DATADIRNAME=lib
      ;;
-@@ -16863,7 +16866,7 @@ fi
+@@ -16804,7 +16807,7 @@ fi
  
  
  # per-machine directory
--CD_SYSTEM_PROFILES_DIR="\$(localstatedir)/lib/color"
-+CD_SYSTEM_PROFILES_DIR="\$(localstatedir)/db/color"
+-CD_SYSTEM_PROFILES_DIR="\$(localstatedir)/lib/colord/icc"
++CD_SYSTEM_PROFILES_DIR="\$(localstatedir)/db/colord/icc"
  
  
- ac_config_files="$ac_config_files Makefile etc/Makefile examples/Makefile man/Makefile doc/Makefile doc/api/Makefile doc/api/dbus/Makefile doc/api/version.xml data/Makefile data/org.freedesktop.ColorManager.conf data/tests/Makefile policy/Makefile rules/Makefile rules/69-cd-sensors.rules po/Makefile.in src/Makefile src/sensors/Makefile client/Makefile libcolord/cd-version.h libcolord/colord.pc libcolord/Makefile"
+ ac_config_files="$ac_config_files Makefile etc/Makefile contrib/Makefile contrib/colord-sane/Makefile contrib/colord-sane/org.freedesktop.colord-sane.conf examples/Makefile man/Makefile doc/Makefile doc/api/Makefile doc/api/dbus/Makefile doc/api/version.xml data/Makefile data/org.freedesktop.ColorManager.conf data/tests/Makefile policy/Makefile rules/Makefile rules/69-cd-sensors.rules po/Makefile.in src/Makefile src/sensors/Makefile client/Makefile libcolord/cd-version.h libcolord/colord.pc libcolord/Makefile"
diff --git a/graphics/colord/patches/patch-etc_colord_conf_in b/graphics/colord/patches/patch-etc_colord_conf_in
index 98d962082e1..da737b0c8ba 100644
--- a/graphics/colord/patches/patch-etc_colord_conf_in
+++ b/graphics/colord/patches/patch-etc_colord_conf_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-etc_colord_conf_in,v 1.1.1.1 2011/11/02 16:40:22 ajacoutot Exp $
---- etc/colord.conf.in.orig	Tue Sep 27 18:34:16 2011
-+++ etc/colord.conf.in	Tue Sep 27 18:34:48 2011
-@@ -21,4 +21,4 @@ CreateDummySensor=false
+$OpenBSD: patch-etc_colord_conf_in,v 1.2 2012/03/19 08:59:00 ajacoutot Exp $
+--- etc/colord.conf.in.orig	Fri Mar  9 21:04:40 2012
++++ etc/colord.conf.in	Sun Mar 18 20:24:56 2012
+@@ -25,4 +25,4 @@ CreateDummySensor=false
  # using the profile dictionary metadata.
  #
  # default=
diff --git a/graphics/colord/patches/patch-src_Makefile_in b/graphics/colord/patches/patch-src_Makefile_in
new file mode 100644
index 00000000000..ae50ac7c5f9
--- /dev/null
+++ b/graphics/colord/patches/patch-src_Makefile_in
@@ -0,0 +1,15 @@
+$OpenBSD: patch-src_Makefile_in,v 1.1 2012/03/19 08:59:00 ajacoutot Exp $
+--- src/Makefile.in.orig	Mon Mar 19 08:59:49 2012
++++ src/Makefile.in	Mon Mar 19 09:15:06 2012
+@@ -1415,11 +1415,6 @@ uninstall-am: uninstall-dist_introspectionDATA \
+ 
+ 
+ install-data-hook:
+-	if test -w $(DESTDIR)$(prefix)/; then \
+-		mkdir -p $(DESTDIR)$(CD_SYSTEM_PROFILES_DIR); \
+-		chown $(daemon_user) $(DESTDIR)$(localstatedir)/lib/colord; \
+-		chmod 0755 $(DESTDIR)$(localstatedir)/lib/colord; \
+-	fi
+ 
+ -include $(top_srcdir)/git.mk
+ 
diff --git a/graphics/colord/patches/patch-src_cd-main_c b/graphics/colord/patches/patch-src_cd-main_c
index a3a917a6162..799274f26a0 100644
--- a/graphics/colord/patches/patch-src_cd-main_c
+++ b/graphics/colord/patches/patch-src_cd-main_c
@@ -1,10 +1,10 @@
-$OpenBSD: patch-src_cd-main_c,v 1.2 2012/01/09 16:28:25 ajacoutot Exp $
+$OpenBSD: patch-src_cd-main_c,v 1.3 2012/03/19 08:59:00 ajacoutot Exp $
 
 /var/lib -> /var/db
 
---- src/cd-main.c.orig	Fri Nov 25 11:57:18 2011
-+++ src/cd-main.c	Mon Jan  9 17:23:43 2012
-@@ -1770,7 +1770,7 @@ main (int argc, char *argv[])
+--- src/cd-main.c.orig	Mon Mar 12 15:00:11 2012
++++ src/cd-main.c	Sun Mar 18 20:24:56 2012
+@@ -1868,7 +1868,7 @@ main (int argc, char *argv[])
  	/* connect to the mapping db */
  	mapping_db = cd_mapping_db_new ();
  	ret = cd_mapping_db_load (mapping_db,
@@ -13,7 +13,7 @@ $OpenBSD: patch-src_cd-main_c,v 1.2 2012/01/09 16:28:25 ajacoutot Exp $
  				  &error);
  	if (!ret) {
  		g_warning ("CdMain: failed to load mapping database: %s",
-@@ -1782,7 +1782,7 @@ main (int argc, char *argv[])
+@@ -1880,7 +1880,7 @@ main (int argc, char *argv[])
  	/* connect to the device db */
  	device_db = cd_device_db_new ();
  	ret = cd_device_db_load (device_db,
diff --git a/graphics/colord/patches/patch-src_cd-profile-store_c b/graphics/colord/patches/patch-src_cd-profile-store_c
index 9a3f3c5ab5d..46ec313f3cb 100644
--- a/graphics/colord/patches/patch-src_cd-profile-store_c
+++ b/graphics/colord/patches/patch-src_cd-profile-store_c
@@ -1,9 +1,9 @@
-$OpenBSD: patch-src_cd-profile-store_c,v 1.1.1.1 2011/11/02 16:40:22 ajacoutot Exp $
+$OpenBSD: patch-src_cd-profile-store_c,v 1.2 2012/03/19 08:59:00 ajacoutot Exp $
 
 /var/lib -> /var/db
 
---- src/cd-profile-store.c.orig	Tue Sep 27 18:11:00 2011
-+++ src/cd-profile-store.c	Tue Sep 27 18:11:30 2011
+--- src/cd-profile-store.c.orig	Sat Mar 10 09:43:32 2012
++++ src/cd-profile-store.c	Sun Mar 18 20:24:56 2012
 @@ -193,8 +193,8 @@ cd_profile_store_add_profile (CdProfileStore *profile_
  
  	/* is system wide? */
@@ -15,9 +15,9 @@ $OpenBSD: patch-src_cd-profile-store_c,v 1.1.1.1 2011/11/02 16:40:22 ajacoutot E
  		cd_profile_set_is_system_wide (profile, TRUE);
  
  	/* parse the profile name */
-@@ -555,7 +555,7 @@ cd_profile_store_search (CdProfileStore *profile_store
- 	/* get machine specific profiles */
- 	if (flags & CD_PROFILE_STORE_SEARCH_MACHINE) {
+@@ -565,7 +565,7 @@ cd_profile_store_search (CdProfileStore *profile_store
+ 		if (ret)
+ 			success = TRUE;
  		ret = cd_profile_store_search_path (profile_store,
 -						    "/var/lib/color/icc");
 +						    "/var/db/color/icc");
diff --git a/graphics/colord/patches/patch-src_cd-profile_c b/graphics/colord/patches/patch-src_cd-profile_c
index 4ed708e06eb..5170442cf6c 100644
--- a/graphics/colord/patches/patch-src_cd-profile_c
+++ b/graphics/colord/patches/patch-src_cd-profile_c
@@ -1,24 +1,15 @@
-$OpenBSD: patch-src_cd-profile_c,v 1.1.1.1 2011/11/02 16:40:22 ajacoutot Exp $
+$OpenBSD: patch-src_cd-profile_c,v 1.2 2012/03/19 08:59:00 ajacoutot Exp $
 
 /var/lib -> /var/db
 
---- src/cd-profile.c.orig	Fri Sep  9 18:09:23 2011
-+++ src/cd-profile.c	Wed Nov  2 15:50:36 2011
-@@ -270,7 +270,7 @@ cd_profile_install_system_wide (CdProfile *profile, GE
+--- src/cd-profile.c.orig	Tue Mar 13 19:37:35 2012
++++ src/cd-profile.c	Sun Mar 18 20:25:51 2012
+@@ -272,7 +272,7 @@ cd_profile_install_system_wide (CdProfile *profile, GE
  		goto out;
  	}
  
 -	/* is profile already installed in /var/lib/color */
 +	/* is profile already installed in /var/db/color */
- 	if (g_str_has_prefix (profile->priv->filename,
+ 	if (g_str_has_prefix (priv->filename,
  			      CD_SYSTEM_PROFILES_DIR)) {
  		ret = FALSE;
-@@ -282,7 +282,7 @@ cd_profile_install_system_wide (CdProfile *profile, GE
- 		goto out;
- 	}
- 
--	/* is profile already installed in /usr/share/color */
-+	/* is profile already installed in ${LOCALBASE}/share/color */
- 	if (g_str_has_prefix (profile->priv->filename,
- 			      DATADIR "/color")) {
- 		ret = FALSE;
diff --git a/graphics/colord/pkg/PFRAG.shared b/graphics/colord/pkg/PFRAG.shared
index d6dd65ad24f..7b43cc7366b 100644
--- a/graphics/colord/pkg/PFRAG.shared
+++ b/graphics/colord/pkg/PFRAG.shared
@@ -1,2 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2011/11/02 16:40:22 ajacoutot Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.2 2012/03/19 08:59:00 ajacoutot Exp $
+lib/colord-sensors/libcolord_sensor_dummy.so
 @lib lib/libcolord.so.${LIBcolord_VERSION}
diff --git a/graphics/colord/pkg/PLIST b/graphics/colord/pkg/PLIST
index 44550f54e03..c061d2b0c1d 100644
--- a/graphics/colord/pkg/PLIST
+++ b/graphics/colord/pkg/PLIST
@@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.3 2012/01/09 16:28:25 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.4 2012/03/19 08:59:00 ajacoutot Exp $
+@newgroup _colord:694
+@newuser _colord:694:_colord:daemon:colord Daemon:/nonexistent:/sbin/nologin
 %%SHARED%%
 @bin bin/cd-create-profile
 @bin bin/cd-fix-profile
@@ -18,6 +20,9 @@ include/colord-1/colord/cd-profile.h
 include/colord-1/colord/cd-sensor-sync.h
 include/colord-1/colord/cd-sensor.h
 include/colord-1/colord/cd-version.h
+lib/colord-sensors/
+@comment lib/colord-sensors/libcolord_sensor_dummy.a
+@comment lib/colord-sensors/libcolord_sensor_dummy.la
 lib/girepository-1.0/
 lib/girepository-1.0/Colord-1.0.typelib
 lib/libcolord.a
@@ -52,6 +57,9 @@ share/locale/as/
 share/locale/as/LC_MESSAGES/
 share/locale/as/LC_MESSAGES/colord.mo
 share/locale/bg/LC_MESSAGES/colord.mo
+share/locale/bg_BG/
+share/locale/bg_BG/LC_MESSAGES/
+share/locale/bg_BG/LC_MESSAGES/colord.mo
 share/locale/bn_IN/
 share/locale/bn_IN/LC_MESSAGES/
 share/locale/bn_IN/LC_MESSAGES/colord.mo
@@ -68,6 +76,7 @@ share/locale/es/LC_MESSAGES/colord.mo
 share/locale/eu/LC_MESSAGES/colord.mo
 share/locale/fi/LC_MESSAGES/colord.mo
 share/locale/fr/LC_MESSAGES/colord.mo
+share/locale/ga/LC_MESSAGES/colord.mo
 share/locale/gl/LC_MESSAGES/colord.mo
 share/locale/gu/
 share/locale/gu/LC_MESSAGES/
@@ -83,12 +92,17 @@ share/locale/it_IT/
 share/locale/it_IT/LC_MESSAGES/
 share/locale/it_IT/LC_MESSAGES/colord.mo
 share/locale/ja/LC_MESSAGES/colord.mo
+share/locale/kk/
+share/locale/kk/LC_MESSAGES/
+share/locale/kk/LC_MESSAGES/colord.mo
 share/locale/kn/
 share/locale/kn/LC_MESSAGES/
 share/locale/kn/LC_MESSAGES/colord.mo
+share/locale/ko/LC_MESSAGES/colord.mo
 share/locale/lt/
 share/locale/lt/LC_MESSAGES/
 share/locale/lt/LC_MESSAGES/colord.mo
+share/locale/lv/LC_MESSAGES/colord.mo
 share/locale/ml/
 share/locale/ml/LC_MESSAGES/
 share/locale/ml/LC_MESSAGES/colord.mo
@@ -137,5 +151,9 @@ share/polkit-1/actions/org.freedesktop.color.policy
 share/vala/
 share/vala/vapi/
 share/vala/vapi/colord.vapi
-@sample /var/db/color/
-@sample /var/db/color/icc/
+@owner _colord
+@group _colord
+@sample /var/db/colord/
+@sample /var/db/colord/icc/
+@owner
+@group