diff -u gnome-session-2.18.0/debian/changelog gnome-session-2.18.0/debian/changelog
--- gnome-session-2.18.0/debian/changelog
+++ gnome-session-2.18.0/debian/changelog
@@ -1,3 +1,11 @@
+gnome-session (2.18.0-0ubuntu2) feisty; urgency=low
+
+  * debian/patches/19_gnome-wm-tweaking.patch:
+    - set to metacity, if /desktop/gnome/applications/window_manager/default
+      does not exist (LP: #87960)
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Mon, 26 Mar 2007 17:42:43 +0200
+
 gnome-session (2.18.0-0ubuntu1) feisty; urgency=low
 
   * New upstream version:
diff -u gnome-session-2.18.0/debian/patches/19_gnome-wm-tweaking.patch gnome-session-2.18.0/debian/patches/19_gnome-wm-tweaking.patch
--- gnome-session-2.18.0/debian/patches/19_gnome-wm-tweaking.patch
+++ gnome-session-2.18.0/debian/patches/19_gnome-wm-tweaking.patch
@@ -1,6 +1,6 @@
-diff -Nur gnome-session-2.17.5/gnome-session/gnome-wm gnome-session-2.17.5.new/gnome-session/gnome-wm
---- gnome-session-2.17.5/gnome-session/gnome-wm	2007-01-08 23:32:28.000000000 +0100
-+++ gnome-session-2.17.5.new/gnome-session/gnome-wm	2007-01-09 12:26:10.000000000 +0100
+diff -Nur gnome-session-2.18.0/gnome-session/gnome-wm gnome-session-2.18.0.new/gnome-session/gnome-wm
+--- gnome-session-2.18.0/gnome-session/gnome-wm	2007-03-12 19:48:31.000000000 +0100
++++ gnome-session-2.18.0.new/gnome-session/gnome-wm	2007-03-26 17:42:14.000000000 +0200
 @@ -1,7 +1,8 @@
  #!/bin/sh
  
@@ -11,7 +11,7 @@
  #
  # If this is not set, we search a list of known windowmanagers and use
  # the first one that is found in the users's PATH
-@@ -37,6 +38,11 @@
+@@ -37,6 +38,16 @@
    esac
  done
  
@@ -20,10 +20,15 @@
 +  DEFWM=`gconftool-2 -g /desktop/gnome/applications/window_manager/default 2>/dev/null`
 +fi
 +
++# If not exist, set to metacity.
++if [ -x "$DEFWM" ]; then
++    gconftool-2 -s /desktop/gnome/applications/window_manager/default /usr/bin/metacity --type string
++fi
++
  # WINDOW_MANAGER overrides all
  
  if [ -z "$WINDOW_MANAGER" ] ; then
-@@ -75,7 +81,7 @@
+@@ -75,7 +86,7 @@
  
  if [ -z "$WINDOW_MANAGER" ] ; then
    echo "WARNING: No window manager can be found."
@@ -32,7 +37,7 @@
  fi
  
  # Now create options OPT1, OPT2 and OPT3 based on the windowmanager used
-@@ -118,6 +124,9 @@
+@@ -118,6 +129,9 @@
      ;;
  esac