diff --git a/pulseaudio.changes b/pulseaudio.changes
index acdbbba..53742cb 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May 29 13:01:46 CEST 2012 - tiwai@suse.de
+
+- Add the setup for SoX to setup-pulseaudio script
+
 -------------------------------------------------------------------
 Sat May 19 20:45:28 UTC 2012 - pascal.bleser@opensuse.org
 
diff --git a/setup-pulseaudio b/setup-pulseaudio
index 28b3be5..c33d47d 100644
--- a/setup-pulseaudio
+++ b/setup-pulseaudio
@@ -156,6 +156,11 @@ enable_festival() {
 EOF
 }
 
+enable_sox() {
+    echo "Enabling PulseAudio for SoX..."
+    set_variable AUDIODRIVER pulseaudio
+}
+
 enable_autospawn() {
     echo "Enabling PulseAudio autospawn..."
     if grep -q ^autospawn /etc/pulse/client.conf; then
@@ -236,6 +241,11 @@ disable_festival() {
     /usr/bin/sed --in-place /"(Parameter.set 'Audio_Required_Format 'snd)"/d /etc/festival.scm
 }
 
+disable_sox() {
+    echo "Disabling PulseAudio for SoX..."
+    set_variable AUDIODRIVER alsa
+}
+
 disable_autospawn() {
     echo "Disabling PulseAudio autospawn..."
     if grep -q ^autospawn /etc/pulse/client.conf; then
@@ -258,6 +268,7 @@ enable_all() {
     enable_autospawn
     enable_phonon
     enable_speechd
+    enable_sox
 }
 
 disable_all() {
@@ -273,6 +284,7 @@ disable_all() {
     disable_autospawn
     disable_phonon
     disable_speechd
+    disable_sox
 }
 
 case $1 in