diff --git a/pulseaudio.changes b/pulseaudio.changes
index 4bcd166..8e0df4f 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 17 17:54:45 CET 2011 - tiwai@suse.de
+
+- Add the setup for festival to setup-pulseaudio script
+  (bnc#670992)
+
 -------------------------------------------------------------------
 Mon Feb 14 19:49:24 CET 2011 - sbrabec@suse.cz
 
diff --git a/setup-pulseaudio b/setup-pulseaudio
index 04c7e0b..d26aa95 100644
--- a/setup-pulseaudio
+++ b/setup-pulseaudio
@@ -140,6 +140,17 @@ enable_xine() {
     return 0
 }
 
+enable_festival() {
+    test -f /etc/festival.scm || return 0
+    echo "Enabling PulseAudio for Festival..."
+    cat << EOF >> /etc/festival.scm
+;;;; Use pulseaudio to output sound
+(Parameter.set 'Audio_Command "paplay -n festival \$FILE")
+(Parameter.set 'Audio_Method 'Audio_Command)
+(Parameter.set 'Audio_Required_Format 'snd)
+EOF
+}
+
 enable_autospawn() {
     echo "Enabling PulseAudio autospawn..."
     if grep -q ^autospawn /etc/pulse/client.conf; then
@@ -210,6 +221,15 @@ disable_xine() {
     return 0
 }
 
+disable_festival() {
+    test -f /etc/festival.scm || return 0
+    echo "Disabling PulseAudio for Festival..."
+    /usr/bin/sed --in-place /";;;; Use pulseaudio to output sound"/d /etc/festival.scm
+    /usr/bin/sed --in-place /"(Parameter.set 'Audio_Command \"paplay -n festival \$FILE\")"/d /etc/festival.scm
+    /usr/bin/sed --in-place /"(Parameter.set 'Audio_Method 'Audio_Command)"/d /etc/festival.scm
+    /usr/bin/sed --in-place /"(Parameter.set 'Audio_Required_Format 'snd)"/d /etc/festival.scm
+}
+
 disable_autospawn() {
     echo "Disabling PulseAudio autospawn..."
     if grep -q ^autospawn /etc/pulse/client.conf; then
@@ -231,6 +251,7 @@ case $1 in
 	enable_sdl
 	enable_timidity
 	enable_xine
+	enable_festival
 	enable_autospawn
 	enable_phonon
 	enable_speechd
@@ -246,6 +267,7 @@ case $1 in
 	disable_sdl
 	disable_timidity
 	disable_xine
+	disable_festival
 	disable_autospawn
 	disable_phonon
 	disable_speechd