diff --git a/pulseaudio.changes b/pulseaudio.changes
index a78552a..ec7c00c 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 29 07:10:31 UTC 2010 - per@osbeck.com
+
+- add support for phonon in setup-pulseaudio
+
 -------------------------------------------------------------------
 Mon Mar  8 22:24:00 UTC 2010 - sreeves@novell.com
 
diff --git a/setup-pulseaudio b/setup-pulseaudio
index 3fd8dd4..d9db659 100644
--- a/setup-pulseaudio
+++ b/setup-pulseaudio
@@ -25,6 +25,11 @@ check_root() {
     fi
 }
 
+enable_phonon() {
+    echo "Enabling PulseAudio for Phonon..."
+    perl -pi -e "s|PHONON_PULSEAUDIO_DISABLE=1||g;" /etc/environment
+}
+
 enable_alsa() {
     echo "Enabling PulseAudio for ALSA..."
     if grep "ALSA_CONFIG_PATH" /etc/environment; then
@@ -125,6 +130,15 @@ disable_alsa() {
     perl -pi -e "s|ALSA_CONFIG_PATH=/etc/alsa-pulse.conf||g;" /etc/environment
 }
 
+disable_phonon() {
+    echo "Disabling PulseAudio for Phonon..."
+    if grep "PHONON_PULSEAUDIO_DISABLE" /etc/environment; then
+	echo "PulseAudio config for Phonon already in use"
+    else
+	echo "PHONON_PULSEAUDIO_DISABLE=1" >> /etc/environment
+    fi
+}
+
 disable_libao() {
     if test -f /etc/libao.conf; then
 	echo "Disabling PulseAudio for libao..."
@@ -199,6 +213,7 @@ case $1 in
 	enable_timidity
 	enable_xine
 	enable_autospawn
+	enable_phonon
 	;;
     --disable)
 	check_root || exit
@@ -212,6 +227,7 @@ case $1 in
 	disable_timidity
 	disable_xine
 	disable_autospawn
+	disable_phonon
 	;;
     --status)
 	STATUS=`grep PULSEAUDIO_ENABLE /etc/sysconfig/sound | cut -f2 -d= | cut -f2 -d\"`