diff --git a/gconf-defaults.patch b/gconf-defaults.patch
index 49953c3..ebf46bb 100644
--- a/gconf-defaults.patch
+++ b/gconf-defaults.patch
@@ -1,6 +1,6 @@
 diff -up GConf-2.22.0/configure.in.defaults GConf-2.22.0/configure.in
 --- GConf-2.22.0/configure.in.defaults	2008-03-10 10:52:28.000000000 -0400
-+++ GConf-2.22.0/configure.in	2008-05-04 18:15:22.000000000 -0400
++++ GConf-2.22.0/configure.in	2008-05-04 18:25:49.000000000 -0400
 @@ -166,6 +166,7 @@ AC_SUBST(DEPENDENT_WITH_GTK_CFLAGS)
  AC_SUBST(DEPENDENT_WITH_XML_AND_GTK_LIBS)
  AC_SUBST(DEPENDENT_WITH_XML_AND_GTK_CFLAGS)
@@ -19,7 +19,7 @@ diff -up GConf-2.22.0/configure.in.defaults GConf-2.22.0/configure.in
  
 diff -up /dev/null GConf-2.22.0/defaults/gconf-defaults.c
 --- /dev/null	2008-05-04 08:09:30.807030239 -0400
-+++ GConf-2.22.0/defaults/gconf-defaults.c	2008-05-04 18:15:22.000000000 -0400
++++ GConf-2.22.0/defaults/gconf-defaults.c	2008-05-04 18:25:49.000000000 -0400
 @@ -0,0 +1,704 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@@ -727,7 +727,7 @@ diff -up /dev/null GConf-2.22.0/defaults/gconf-defaults.c
 +}
 diff -up /dev/null GConf-2.22.0/defaults/gconf-defaults.h
 --- /dev/null	2008-05-04 08:09:30.807030239 -0400
-+++ GConf-2.22.0/defaults/gconf-defaults.h	2008-05-04 18:15:22.000000000 -0400
++++ GConf-2.22.0/defaults/gconf-defaults.h	2008-05-04 18:25:49.000000000 -0400
 @@ -0,0 +1,84 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@@ -815,7 +815,7 @@ diff -up /dev/null GConf-2.22.0/defaults/gconf-defaults.h
 +#endif /* GCONF_DEFAULTS_H */
 diff -up /dev/null GConf-2.22.0/defaults/gconf-defaults-main.c
 --- /dev/null	2008-05-04 08:09:30.807030239 -0400
-+++ GConf-2.22.0/defaults/gconf-defaults-main.c	2008-05-04 18:15:22.000000000 -0400
++++ GConf-2.22.0/defaults/gconf-defaults-main.c	2008-05-04 18:25:49.000000000 -0400
 @@ -0,0 +1,174 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@@ -993,7 +993,7 @@ diff -up /dev/null GConf-2.22.0/defaults/gconf-defaults-main.c
 +}
 diff -up /dev/null GConf-2.22.0/defaults/gconf-defaults.xml
 --- /dev/null	2008-05-04 08:09:30.807030239 -0400
-+++ GConf-2.22.0/defaults/gconf-defaults.xml	2008-05-04 18:15:22.000000000 -0400
++++ GConf-2.22.0/defaults/gconf-defaults.xml	2008-05-04 18:25:49.000000000 -0400
 @@ -0,0 +1,61 @@
 +<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 +<node name="/">
@@ -1058,7 +1058,7 @@ diff -up /dev/null GConf-2.22.0/defaults/gconf-defaults.xml
 +</node>
 diff -up /dev/null GConf-2.22.0/defaults/Makefile.am
 --- /dev/null	2008-05-04 08:09:30.807030239 -0400
-+++ GConf-2.22.0/defaults/Makefile.am	2008-05-04 18:18:04.000000000 -0400
++++ GConf-2.22.0/defaults/Makefile.am	2008-05-04 18:28:36.000000000 -0400
 @@ -0,0 +1,56 @@
 +libexec_PROGRAMS = gconf-defaults-mechanism
 +
@@ -1080,7 +1080,7 @@ diff -up /dev/null GConf-2.22.0/defaults/Makefile.am
 +	$(DEFAULTS_CFLAGS)
 +
 +gconf_defaults_mechanism_LDADD = \
-+	$(top_builddir}/gconf/libgconf-2.la \
++	$(top_builddir)/gconf/libgconf-2.la \
 +	$(DEFAULTS_LIBS) 
 +
 +BUILT_SOURCES = gconf-defaults-glue.h
@@ -1118,7 +1118,7 @@ diff -up /dev/null GConf-2.22.0/defaults/Makefile.am
 +
 diff -up /dev/null GConf-2.22.0/defaults/org.gnome.GConf.Defaults.conf
 --- /dev/null	2008-05-04 08:09:30.807030239 -0400
-+++ GConf-2.22.0/defaults/org.gnome.GConf.Defaults.conf	2008-05-04 18:15:22.000000000 -0400
++++ GConf-2.22.0/defaults/org.gnome.GConf.Defaults.conf	2008-05-04 18:25:49.000000000 -0400
 @@ -0,0 +1,23 @@
 +<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
 +
@@ -1145,7 +1145,7 @@ diff -up /dev/null GConf-2.22.0/defaults/org.gnome.GConf.Defaults.conf
 +</busconfig>
 diff -up /dev/null GConf-2.22.0/defaults/org.gnome.gconf.defaults.policy.in
 --- /dev/null	2008-05-04 08:09:30.807030239 -0400
-+++ GConf-2.22.0/defaults/org.gnome.gconf.defaults.policy.in	2008-05-04 18:15:22.000000000 -0400
++++ GConf-2.22.0/defaults/org.gnome.gconf.defaults.policy.in	2008-05-04 18:25:49.000000000 -0400
 @@ -0,0 +1,28 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE policyconfig PUBLIC
@@ -1177,7 +1177,7 @@ diff -up /dev/null GConf-2.22.0/defaults/org.gnome.gconf.defaults.policy.in
 +</policyconfig>
 diff -up /dev/null GConf-2.22.0/defaults/org.gnome.GConf.Defaults.service.in
 --- /dev/null	2008-05-04 08:09:30.807030239 -0400
-+++ GConf-2.22.0/defaults/org.gnome.GConf.Defaults.service.in	2008-05-04 18:15:22.000000000 -0400
++++ GConf-2.22.0/defaults/org.gnome.GConf.Defaults.service.in	2008-05-04 18:25:49.000000000 -0400
 @@ -0,0 +1,4 @@
 +[D-BUS Service]
 +Name=org.gnome.GConf.Defaults
@@ -1185,7 +1185,7 @@ diff -up /dev/null GConf-2.22.0/defaults/org.gnome.GConf.Defaults.service.in
 +User=root
 diff -up GConf-2.22.0/Makefile.am.defaults GConf-2.22.0/Makefile.am
 --- GConf-2.22.0/Makefile.am.defaults	2007-06-25 07:11:31.000000000 -0400
-+++ GConf-2.22.0/Makefile.am	2008-05-04 18:15:22.000000000 -0400
++++ GConf-2.22.0/Makefile.am	2008-05-04 18:25:49.000000000 -0400
 @@ -1,5 +1,5 @@
  
 -SUBDIRS = gconf backends po doc examples
@@ -1195,7 +1195,7 @@ diff -up GConf-2.22.0/Makefile.am.defaults GConf-2.22.0/Makefile.am
  EXTRA_DIST =                \
 diff -up GConf-2.22.0/po/POTFILES.in.defaults GConf-2.22.0/po/POTFILES.in
 --- GConf-2.22.0/po/POTFILES.in.defaults	2007-06-25 07:11:31.000000000 -0400
-+++ GConf-2.22.0/po/POTFILES.in	2008-05-04 18:15:22.000000000 -0400
++++ GConf-2.22.0/po/POTFILES.in	2008-05-04 18:25:49.000000000 -0400
 @@ -9,6 +9,7 @@ backends/xml-backend.c
  backends/xml-cache.c
  backends/xml-dir.c