diff -durN colord-0.1.25.orig/configure.ac colord-0.1.25/configure.ac
--- colord-0.1.25.orig/configure.ac	2012-11-26 21:25:34.000000000 +0400
+++ colord-0.1.25/configure.ac	2012-11-27 14:14:09.308738419 +0400
@@ -265,7 +265,7 @@
 AM_CONDITIONAL(HAVE_VAPIGEN, [test "x$has_vapigen" = "xyes"])
 
 # per-machine directory
-AC_SUBST(CD_SYSTEM_PROFILES_DIR, "\$(localstatedir)/lib/colord/icc")
+AC_SUBST(CD_SYSTEM_PROFILES_DIR, "\$(localstatedir)/colord/icc")
 
 dnl ---------------------------------------------------------------------------
 dnl - Makefiles, etc.
diff -durN colord-0.1.25.orig/src/cd-main.c colord-0.1.25/src/cd-main.c
--- colord-0.1.25.orig/src/cd-main.c	2012-11-23 15:51:53.000000000 +0400
+++ colord-0.1.25/src/cd-main.c	2012-11-27 14:14:09.308738419 +0400
@@ -2154,7 +2154,7 @@
 	/* connect to the mapping db */
 	priv->mapping_db = cd_mapping_db_new ();
 	ret = cd_mapping_db_load (priv->mapping_db,
-				  LOCALSTATEDIR "/lib/colord/mapping.db",
+				  LOCALSTATEDIR "/colord/mapping.db",
 				  &error);
 	if (!ret) {
 		g_warning ("CdMain: failed to load mapping database: %s",
@@ -2166,7 +2166,7 @@
 	/* connect to the device db */
 	priv->device_db = cd_device_db_new ();
 	ret = cd_device_db_load (priv->device_db,
-				 LOCALSTATEDIR "/lib/colord/storage.db",
+				 LOCALSTATEDIR "/colord/storage.db",
 				 &error);
 	if (!ret) {
 		g_warning ("CdMain: failed to load device database: %s",
diff -durN colord-0.1.25.orig/src/Makefile.am colord-0.1.25/src/Makefile.am
--- colord-0.1.25.orig/src/Makefile.am	2012-11-21 16:27:04.000000000 +0400
+++ colord-0.1.25/src/Makefile.am	2012-11-27 14:14:09.308738419 +0400
@@ -120,8 +120,8 @@
 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; \
+		chown $(daemon_user) $(DESTDIR)$(localstatedir)/colord; \
+		chmod 0755 $(DESTDIR)$(localstatedir)/colord; \
 	fi
 
 TESTS = cd-self-test