diff --git a/pulseaudio.changes b/pulseaudio.changes
index 53742cb..9958e0f 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 30 09:49:36 CEST 2012 - tiwai@suse.de
+
+- Kill leftover PA processes when disabled via setup-pulseaudio
+- Set up gstreamer audiosink/src in setup-pulseaudio script, too
+
 -------------------------------------------------------------------
 Tue May 29 13:01:46 CEST 2012 - tiwai@suse.de
 
diff --git a/setup-pulseaudio b/setup-pulseaudio
index c33d47d..b0ecd7f 100644
--- a/setup-pulseaudio
+++ b/setup-pulseaudio
@@ -57,6 +57,14 @@ delete_variable () {
     fi
 }
 
+setup_gconf_vendor() {
+    if [ -x /usr/bin/gconftool-2 ]; then
+	/usr/bin/gconftool-2 --direct --config-source \
+	    xml:readwrite:/etc/gconf/gconf.xml.vendor \
+	    "$@"
+    fi
+}
+
 enable_phonon() {
     echo "Enabling PulseAudio for Phonon..."
     delete_variable PHONON_PULSEAUDIO_DISABLE
@@ -161,6 +169,19 @@ enable_sox() {
     set_variable AUDIODRIVER pulseaudio
 }
 
+enable_gstreamer() {
+    # set autoaudiosink/src, which should pick up PA
+    echo "Setting auto sink/src for gstreamer"
+    setup_gconf_vendor -s -t str \
+	/system/gstreamer/0.10/default/audiosink autoaudiosink
+    setup_gconf_vendor -s -t str \
+	/system/gstreamer/0.10/default/musicaudiosink autoaudiosink
+    setup_gconf_vendor -s -t str \
+	/system/gstreamer/0.10/default/chataudiosink autoaudiosink
+    setup_gconf_vendor -s -t str \
+	/system/gstreamer/0.10/default/audiosrc autoaudiosrc
+}
+
 enable_autospawn() {
     echo "Enabling PulseAudio autospawn..."
     if grep -q ^autospawn /etc/pulse/client.conf; then
@@ -246,6 +267,18 @@ disable_sox() {
     set_variable AUDIODRIVER alsa
 }
 
+disable_gstreamer() {
+    echo "Setting alsasink/src for gstreamer"
+    setup_gconf_vendor -s -t str \
+	/system/gstreamer/0.10/default/audiosink alsasink
+    setup_gconf_vendor -s -t str \
+	/system/gstreamer/0.10/default/musicaudiosink alsasink
+    setup_gconf_vendor -s -t str \
+	/system/gstreamer/0.10/default/chataudiosink alsasink
+    setup_gconf_vendor -s -t str \
+	/system/gstreamer/0.10/default/audiosrc alsasrc
+}
+
 disable_autospawn() {
     echo "Disabling PulseAudio autospawn..."
     if grep -q ^autospawn /etc/pulse/client.conf; then
@@ -253,6 +286,8 @@ disable_autospawn() {
     else
 	echo "autospawn = no" >> /etc/pulse/client.conf
     fi
+    # kill leftover PA processes
+    killall pulseaudio > /dev/null 2>&1
 }
 
 enable_all() {
@@ -265,10 +300,11 @@ enable_all() {
     enable_timidity
     enable_xine
     enable_festival
-    enable_autospawn
     enable_phonon
     enable_speechd
     enable_sox
+    enable_gstreamer
+    enable_autospawn
 }
 
 disable_all() {
@@ -281,10 +317,11 @@ disable_all() {
     disable_timidity
     disable_xine
     disable_festival
-    disable_autospawn
     disable_phonon
     disable_speechd
     disable_sox
+    disable_gstreamer
+    disable_autospawn
 }
 
 case $1 in