diff --git a/gnome b/gnome
index b39986a..39158e9 100644
--- a/gnome
+++ b/gnome
@@ -69,10 +69,4 @@ fi
 # Uncomment after SLED12, remove after SLED14:
 #rm -f ~/.skel/gnome2-run ~/.skel/gnome2-run-9.2 ~/.skel/sled10-run
 
-# TODO: look for a better fix for 11.1
-export SDL_AUDIODRIVER=pulse
-if test -f /etc/alsa-pulse.conf ; then
-  export ALSA_CONFIG_PATH=/etc/alsa-pulse.conf
-fi
-
-exec /usr/bin/gnome-session
+exec /usr/bin/gnome-session $*
diff --git a/gnome-session.changes b/gnome-session.changes
index 474db79..2c98a07 100644
--- a/gnome-session.changes
+++ b/gnome-session.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Jul 22 18:08:04 CEST 2011 - vuntz@opensuse.org
+
+- Update /usr/bin/gnome script:
+  + Do not set SDL_AUDIODRIVER and ALSA_CONFIG_PATH environment
+    variables. This should be properly configured in
+    /etc/profile.d/pulseaudio.sh now, thanks to the fix for
+    bnc#707703.
+  + Pass arguments to /usr/bin/gnome-session. This makes it
+    possible to use the script and still use a non-default session
+    (with gnome-session --session XYZ).
+
 -------------------------------------------------------------------
 Thu Jul  7 12:42:34 CEST 2011 - vuntz@opensuse.org