diff --git a/pulseaudio.changes b/pulseaudio.changes
index 744752a..8e0df4f 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+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
+
+- Added support for translation-update-upstream.
+
 -------------------------------------------------------------------
 Sat Jan 22 01:05:20 UTC 2011 - sreeves@novell.com
 
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 144a147..ebe4488 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -55,6 +55,7 @@ BuildRequires:  lirc-devel
 BuildRequires:  libudev-devel >= 143
 BuildRequires:  speex-devel
 BuildRequires:  tcpd-devel
+BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11-devel
 PreReq:         pwdutils
@@ -67,7 +68,7 @@ Obsoletes:      libpulsecore9 <= 0.9.14
 Obsoletes:      libpulsecore7 <= 0.9.12
 
 %description
-pulseaudio is a networked sound server for Linux and other Unix like
+pulseaudio is a networked sound server for Linux, other Unix like
 operating systems and Microsoft Windows. It is intended to be an
 improved drop-in replacement for the Enlightened Sound Daemon (ESOUND).
 
@@ -230,7 +231,7 @@ improved drop-in replacement for the Enlightened Sound Daemon (ESOUND).
 %package gdm-hooks
 Summary:        PulseAudio GDM integration
 License:        GPLv2+ ; LGPLv2.1+
-Group:          Applications/Multimedia
+Group:          Productivity/Multimedia/Other
 Requires:       %{name} = %{version}
 Requires:       gdm >= 2.22
 #for the gdm user
@@ -244,6 +245,7 @@ This package contains GDM integration hooks for the PulseAudio sound server.
 %lang_package
 %prep
 %setup -q -T -b0
+translation-update-upstream
 %patch0
 %patch1 -p1
 
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