diff -up gnome-session-2.19.6/data/gnome-session.schemas.in.window-manager gnome-session-2.19.6/data/gnome-session.schemas.in
--- gnome-session-2.19.6/data/gnome-session.schemas.in.window-manager	2007-07-30 16:07:16.000000000 -0400
+++ gnome-session-2.19.6/data/gnome-session.schemas.in	2007-08-09 17:47:42.000000000 -0400
@@ -2,11 +2,22 @@
 <gconfschemafile>
    <schemalist>
       <schema>
+         <key>/schemas/apps/gnome-session/rh/window_manager</key>
+         <applyto>/apps/gnome-session/rh/window_manager</applyto>
+         <owner>gnome</owner>
+         <type>string</type>
+         <default>metacity</default>
+         <locale name="C">
+	    <short>Window Manager to start</short>
+	    <long>The Window manager that gnome-session will start. Valid values are "metacity" and "compiz".</long>
+         </locale>
+      </schema>
+      <schema>
          <key>/schemas/apps/gnome-session/options/show_splash_screen</key>
          <applyto>/apps/gnome-session/options/show_splash_screen</applyto>
          <owner>gnome</owner>
          <type>bool</type>
-         <default>true</default>
+         <default>false</default>
          <locale name="C">
             <short>Show the splash screen</short>
             <long>Show the splash screen when the session starts up</long>
diff -up gnome-session-2.19.6/gnome-session/gnome-wm.window-manager gnome-session-2.19.6/gnome-session/gnome-wm
--- gnome-session-2.19.6/gnome-session/gnome-wm.window-manager	2007-07-30 16:07:15.000000000 -0400
+++ gnome-session-2.19.6/gnome-session/gnome-wm	2007-08-10 15:01:04.000000000 -0400
@@ -3,7 +3,9 @@
 # The user can specify his prefered WM by setting the WINDOW_MANAGER
 # environment variable.
 #
-# If this is not set, we search a list of known windowmanagers and use
+# If this is not set, we check the /apps/gnome-session/rh/window_manager key
+# and go off that.  finally, if all else fails we search a list of known 
+# windowmanagers and use
 # the first one that is found in the users's PATH
 #
 
@@ -38,6 +40,9 @@ for n in "$@" ; do
 done
 
 # WINDOW_MANAGER overrides all
+if [ -z "$WINDOW_MANAGER" ] ; then
+	WINDOW_MANAGER=$(gconftool-2 --get /apps/gnome-session/rh/window_manager)
+fi
 
 if [ -z "$WINDOW_MANAGER" ] ; then
   # Create a list of window manager we can handle, trying to only use the
@@ -82,6 +87,7 @@ fi
 OPT1=
 OPT2=
 OPT3=
+OPT4=
 if [ ! -z "$SMID" ] ; then
   case `basename $WINDOW_MANAGER` in
     sawfish|sawmill|metacity)
@@ -117,14 +123,16 @@ fi
 
 case `basename $WINDOW_MANAGER` in
   compiz)
+    export LIBGL_ALWAYS_INDIRECT=1
     gtk-window-decorator &
-    OPT3=gconf
+    OPT3=glib
+    OPT4=gconf
     ;;
   beryl)
     emerald &
     ;;
 esac
 
-exec $WINDOW_MANAGER $OPT1 $OPT2 $OPT3
+exec $WINDOW_MANAGER $OPT1 $OPT2 $OPT3 $OPT4
 
 echo "ERROR: No window manager could run!"