diff -u gconf-2.23.2/debian/gconf2-common.dirs gconf-2.23.2/debian/gconf2-common.dirs
--- gconf-2.23.2/debian/gconf2-common.dirs
+++ gconf-2.23.2/debian/gconf2-common.dirs
@@ -1,6 +1,7 @@
 /etc/gconf/2
 /etc/gconf/gconf.xml.mandatory
 /etc/gconf/gconf.xml.defaults
+/etc/gconf/gconf.xml.system
 /usr/share/gconf/defaults
 /var/lib/gconf/defaults
 /var/lib/gconf/debian.defaults
diff -u gconf-2.23.2/debian/changelog gconf-2.23.2/debian/changelog
--- gconf-2.23.2/debian/changelog
+++ gconf-2.23.2/debian/changelog
@@ -1,3 +1,10 @@
+gconf (2.23.2-0ubuntu3) intrepid; urgency=low
+
+  * create /etc/gconf/gconf.xml.system
+  * include it in the default gconf path
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 11 Sep 2008 13:33:30 +0200
+
 gconf (2.23.2-0ubuntu2) intrepid; urgency=low
 
   * debian/control.in:
diff -u gconf-2.23.2/debian/default.path gconf-2.23.2/debian/default.path
--- gconf-2.23.2/debian/default.path
+++ gconf-2.23.2/debian/default.path
@@ -45,6 +45,9 @@
 # installed by hand.
 xml:readonly:/etc/gconf/gconf.xml.defaults
 
+# new system defaults mechanism
+xml:readonly:/etc/gconf/gconf.xml.system
+
 # Debian branding, including CDD or packaged branding
 xml:readonly:/var/lib/gconf/debian.defaults