diff -Nru gdm-guest-session-0.16/debian/changelog gdm-guest-session-0.17/debian/changelog
--- gdm-guest-session-0.16/debian/changelog	2010-09-13 10:01:11.000000000 +0200
+++ gdm-guest-session-0.17/debian/changelog	2010-10-09 21:32:07.000000000 +0200
@@ -1,3 +1,12 @@
+gdm-guest-session (0.17) maverick-proposed; urgency=low
+
+  * Makefile:
+    - symlink the restricted session env variable to une one to workaround
+      gconfd in maverick, seeing GDMSESSION=une-guest-restricted instead of
+      "une", like other any other process in the guest session (LP: #657371)
+
+ -- Didier Roche <didrocks@ubuntu.com>  Sat, 09 Oct 2010 20:57:14 +0200
+
 gdm-guest-session (0.16) maverick; urgency=low
 
   * debian/control: Drop Vcs-Bzr, switch to lp:ubuntu/gdm-guest-session.
diff -Nru gdm-guest-session-0.16/Makefile gdm-guest-session-0.17/Makefile
--- gdm-guest-session-0.16/Makefile	2010-09-13 09:35:58.000000000 +0200
+++ gdm-guest-session-0.17/Makefile	2010-10-09 21:32:00.000000000 +0200
@@ -1,4 +1,5 @@
 GDMDIR=/usr/share/gdm/guest-session/
+GCONFDIR=/usr/share/gconf/
 APPARMORDIR=/etc/apparmor.d/
 XSESSIONDIR=/usr/share/xsessions
 
@@ -6,12 +7,14 @@
 	for f in gdm/*; do sh -n $$f; done
 	
 install:
-	install -d $(DESTDIR)$(GDMDIR) $(DESTDIR)$(APPARMORDIR) $(DESTDIR)$(XSESSIONDIR)
+	install -d $(DESTDIR)$(GDMDIR) $(DESTDIR)$(APPARMORDIR) $(DESTDIR)$(XSESSIONDIR) $(DESTDIR)$(GCONFDIR)
 	install -m 755 gdm/* $(DESTDIR)$(GDMDIR)
 	install -m 644 apparmor/* $(DESTDIR)$(APPARMORDIR)
 	install -m 644 guest-restricted.desktop $(DESTDIR)$(XSESSIONDIR)
 	ln -s guest-restricted.desktop $(DESTDIR)$(XSESSIONDIR)/une-guest-restricted.desktop
 	ln -s guest-restricted.desktop $(DESTDIR)$(XSESSIONDIR)/une-efl-guest-restricted.desktop
+	ln -s une.default.path $(DESTDIR)$(GCONFDIR)/une-guest-restricted.default.path
+	ln -s une.mandatory.path $(DESTDIR)$(GCONFDIR)/une-guest-restricted.mandatory.path
 
 uninstall:
 	for f in $(shell ls gdm); do rm -f $(DESTDIR)$(GDMDIR)$$f; done