diff --git a/pulseaudio.changes b/pulseaudio.changes
index f35ac22..314d87f 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jun 18 15:50:43 CEST 2012 - tiwai@suse.de
+
+- Add kmix setup to setup-pulseaudio script
+
 -------------------------------------------------------------------
 Wed Jun  6 14:16:34 CEST 2012 - tiwai@suse.de
 
diff --git a/setup-pulseaudio b/setup-pulseaudio
index f960631..bab3575 100644
--- a/setup-pulseaudio
+++ b/setup-pulseaudio
@@ -70,6 +70,11 @@ enable_phonon() {
     delete_variable PHONON_PULSEAUDIO_DISABLE
 }
 
+enable_kmix() {
+    echo "Enabling PulseAudio for Kmix..."
+    delete_variable KMIX_PULSEAUDIO_DISABLE
+}
+
 enable_alsa() {
     echo "Enabling PulseAudio for ALSA..."
     set_variable ALSA_CONFIG_PATH /etc/alsa-pulse.conf
@@ -201,6 +206,11 @@ disable_phonon() {
     set_variable PHONON_PULSEAUDIO_DISABLE 1
 }
 
+disable_kmix() {
+    echo "Disabling PulseAudio for Kmix..."
+    set_variable KMIX_PULSEAUDIO_DISABLE 1
+}
+
 disable_libao() {
     if test -f /etc/libao.conf; then
 	echo "Disabling PulseAudio for libao..."
@@ -301,6 +311,7 @@ enable_all() {
     enable_xine
     enable_festival
     enable_phonon
+    enable_kmix
     enable_speechd
     enable_sox
     enable_gstreamer
@@ -318,6 +329,7 @@ disable_all() {
     disable_xine
     disable_festival
     disable_phonon
+    disable_kmix
     disable_speechd
     disable_sox
     disable_gstreamer