diff -Nru gdm-guest-session-0.7/debian/changelog gdm-guest-session-0.7ubuntu1/debian/changelog
--- gdm-guest-session-0.7/debian/changelog	2008-11-10 17:19:02.000000000 +0100
+++ gdm-guest-session-0.7ubuntu1/debian/changelog	2009-01-02 11:19:06.000000000 +0100
@@ -1,3 +1,14 @@
+gdm-guest-session (0.7ubuntu1) jaunty; urgency=low
+
+  * Added apparmor dependency. (LP: #310776)
+  * /etc/skel is copied to guest's home directory. (LP: #296993)
+  * Added guest-prepare.sh script, a script that end users can modify to 
+    set guest's default settings.
+  * Disactivated user-dirs-gtk, jockey-gtk and update-manager services, they 
+    are redundant for the guest user. (LP: #255557)
+
+ -- David D Lowe <daviddlowe.flimm@gmail.com>  Fri, 02 Jan 2009 11:18:42 +0100
+
 gdm-guest-session (0.7) jaunty; urgency=low
 
   * apparmor/gdm-guest-session: Generously allow flock() for most file system
diff -Nru gdm-guest-session-0.7/debian/control gdm-guest-session-0.7ubuntu1/debian/control
--- gdm-guest-session-0.7/debian/control	2008-07-30 17:52:26.000000000 +0200
+++ gdm-guest-session-0.7ubuntu1/debian/control	2009-01-01 15:40:44.000000000 +0100
@@ -8,7 +8,7 @@
 
 Package: gdm-guest-session
 Architecture: all
-Depends: gdm (>= 2.20.7-0ubuntu3), passwd
+Depends: gdm (>= 2.20.7-0ubuntu3), passwd, apparmor
 Description: gdm extension for guest session
  This package adds support for starting a guest session through gdm's
  flexiserver, which any already logged in user can launch.
diff -Nru gdm-guest-session-0.7/gdm/guest-prepare.sh gdm-guest-session-0.7ubuntu1/gdm/guest-prepare.sh
--- gdm-guest-session-0.7/gdm/guest-prepare.sh	1970-01-01 01:00:00.000000000 +0100
+++ gdm-guest-session-0.7ubuntu1/gdm/guest-prepare.sh	2009-01-02 10:06:38.000000000 +0100
@@ -0,0 +1,32 @@
+#!/bin/sh -e
+# Author: David D Lowe
+# License: released into public domain
+#
+# This script is called once the guest session has been set up. If you need to change the default settings for 
+# the guest user, you can do so here.
+# Please note that the contents of /etc/skel have already been copied to guest's home directory
+
+USER=guest
+HOME=`getent passwd "$USER" | cut -f6 -d:`
+
+# disable screensaver, to avoid locking guest out of itself (no password)
+su $USER <<EOF
+gconftool --set --type bool /apps/gnome_settings_daemon/screensaver/start_screensaver False
+gconftool --set --type bool /apps/gnome_settings_daemon/plugins/screensaver/active False
+EOF
+
+# disable some services that are redundant for the guest session
+mkdir --parents "$HOME"/.config/autostart
+cd /etc/xdg/autostart/
+services="jockey-gtk.desktop update-notifier.desktop user-dirs-update-gtk.desktop"
+for service in $services
+do
+    if [ -e /etc/xdg/autostart/"$service" ] ; then
+        cp "$service" "$HOME"/.config/autostart
+        echo "X-GNOME-Autostart-enabled=false" >> "$HOME"/.config/autostart/"$service"
+    fi
+done
+
+chmod -R $USER:$USER "$HOME"
+
+
diff -Nru gdm-guest-session-0.7/gdm/guest-session-setup.sh gdm-guest-session-0.7ubuntu1/gdm/guest-session-setup.sh
--- gdm-guest-session-0.7/gdm/guest-session-setup.sh	2008-09-29 12:49:23.000000000 +0200
+++ gdm-guest-session-0.7ubuntu1/gdm/guest-session-setup.sh	2009-01-01 18:36:29.000000000 +0100
@@ -2,6 +2,7 @@
 # (C) 2008 Canonical Ltd.
 # Author: Martin Pitt <martin.pitt@ubuntu.com>
 # License: GPL v2 or later
+# modified by David D Lowe and Thomas Detoux
 #
 # Setup user and temporary home directory for guest session.
 # If this succeeds, this script needs to print the username as last line to
@@ -43,13 +44,11 @@
 HOME=`mktemp -td guest-home.XXXXXX`
 mount -t tmpfs -o mode=700 none "$HOME" || { rm -rf "$HOME"; exit 1; }
 chown $USER:$USER "$HOME"
+cp -r /etc/skel/* "$HOME"
+chown -R $USER:$USER "$HOME"
 usermod -d "$HOME" "$USER"
 
-# disable screensaver, to avoid locking guest out of itself (no password)
-su guest <<EOF
-gconftool --set --type bool /apps/gnome_settings_daemon/screensaver/start_screensaver False
-gconftool --set --type bool /apps/gnome_settings_daemon/plugins/screensaver/active False
-EOF
+/usr/share/gdm/guest-session/guest-prepare.sh
 
 echo #TODO: bug workaround, gdm expects to find a newline
 
diff -Nru gdm-guest-session-0.7/xnest-guest gdm-guest-session-0.7ubuntu1/xnest-guest
--- gdm-guest-session-0.7/xnest-guest	2008-07-30 16:48:12.000000000 +0200
+++ gdm-guest-session-0.7ubuntu1/xnest-guest	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-#!/bin/sh
-COOKIE=`xauth list|head -n 1 | awk '{ print $3 }'`
-gdmflexiserver -a -c "FLEXI_XNEST_USER :guest $DISPLAY `id -u` $COOKIE $HOME/.Xauthority"