diff --git a/pulseaudio.changes b/pulseaudio.changes
index 60df776..25c3911 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov 27 15:23:42 CET 2012 - tiwai@suse.de
+
+- Add the audio setup for qemu/kvm to setup-pulseaudio script
+  (bnc#737070)
+
 -------------------------------------------------------------------
 Sat Nov 17 02:01:24 UTC 2012 - crrodriguez@opensuse.org
 
diff --git a/setup-pulseaudio b/setup-pulseaudio
index 8ef63e0..f17b1a3 100644
--- a/setup-pulseaudio
+++ b/setup-pulseaudio
@@ -191,6 +191,11 @@ enable_gstreamer() {
 	/system/gstreamer/0.10/default/audiosrc autoaudiosrc
 }
 
+enable_qemu () {
+    echo "Enabling PulseAudio for QEMU/KVM"
+    set_variable QEMU_AUDIO_DRV pa
+}
+
 enable_autospawn() {
     echo "Enabling PulseAudio autospawn..."
     if grep -q ^autospawn /etc/pulse/client.conf; then
@@ -293,6 +298,11 @@ disable_gstreamer() {
 	/system/gstreamer/0.10/default/audiosrc alsasrc
 }
 
+disable_qemu () {
+    echo "Clearing QEMU/KVM audio setup"
+    delete_variable QEMU_AUDIO_DRV
+}
+
 disable_autospawn() {
     echo "Disabling PulseAudio autospawn..."
     if grep -q ^autospawn /etc/pulse/client.conf; then
@@ -319,6 +329,7 @@ enable_all() {
     enable_speechd
     enable_sox
     enable_gstreamer
+    enable_qemu
     enable_autospawn
 }
 
@@ -337,6 +348,7 @@ disable_all() {
     disable_speechd
     disable_sox
     disable_gstreamer
+    disable_qemu
     disable_autospawn
 }