diff --git a/gnome-session-2.17.5-window-manager.patch b/gnome-session-2.17.5-window-manager.patch
new file mode 100644
index 0000000..4fe7839
--- /dev/null
+++ b/gnome-session-2.17.5-window-manager.patch
@@ -0,0 +1,49 @@
+--- gnome-session-2.17.5/gnome-session/gnome-session.schemas.in.window-manager	2007-01-08 17:32:28.000000000 -0500
++++ gnome-session-2.17.5/gnome-session/gnome-session.schemas.in	2007-01-11 14:05:30.000000000 -0500
+@@ -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>
+--- gnome-session-2.17.5/gnome-session/gnome-wm.window-manager	2007-01-08 17:32:28.000000000 -0500
++++ gnome-session-2.17.5/gnome-session/gnome-wm	2007-01-11 14:08:11.000000000 -0500
+@@ -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 @@
+ 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
diff --git a/gnome-session.spec b/gnome-session.spec
index ec4f830..ebe8cac 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -51,10 +51,10 @@ Patch8: gnome-session-2.16.0-shaped.patch
 Patch9: gnome-session-2.13.4-no-crashes.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=350848
-Patch13: gnome-session-2.15.91-window-manager.patch
+# The gconf bits weren't accepted upstream, so we'll
+# need to figure something out here
+Patch13: gnome-session-2.17.5-window-manager.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=84315
-Patch14: gnome-session-2.17.2-http-proxy.patch
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -97,7 +97,6 @@ GNOME components and handles logout and saving the session.
 %patch8 -p1 -b .shaped
 %patch9 -p1 -b .no-crashes
 %patch13 -p1 -b .window-manager
-%patch14 -p1 -b .http-proxy
 
 %build