diff --git a/0001-Workaround-a-hang-if-there-are-server-problems.patch b/0001-Workaround-a-hang-if-there-are-server-problems.patch
new file mode 100644
index 0000000..bc84ce3
--- /dev/null
+++ b/0001-Workaround-a-hang-if-there-are-server-problems.patch
@@ -0,0 +1,28 @@
+From 151ddf4a0d6f4db39ccabf78b083a4343623bbc7 Mon Sep 17 00:00:00 2001
+From: Christopher Aillon <caillon@redhat.com>
+Date: Sat, 5 Mar 2011 11:03:31 -0800
+Subject: [PATCH] Workaround a hang if there are server problems
+
+https://bugs.freedesktop.org/show_bug.cgi?id=35024
+---
+ src/pulse.c |    4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/src/pulse.c b/src/pulse.c
+index d4225d1..8b4188b 100644
+--- a/src/pulse.c
++++ b/src/pulse.c
+@@ -312,10 +312,6 @@ static void context_state_cb(pa_context *pc, void *userdata) {
+                         }
+ 
+                         p->subscribed = FALSE;
+-
+-                        /* If we managed to connect once, then let's try to
+-                         * reconnect, and pass NOFAIL */
+-                        context_connect(c, TRUE);
+                 }
+         }
+ 
+-- 
+1.7.4.1
+
diff --git a/libcanberra.spec b/libcanberra.spec
index 188ce95..7b7880d 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,9 +1,10 @@
 Name: libcanberra
 Version: 0.28
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
+Patch0: 0001-Workaround-a-hang-if-there-are-server-problems.patch
 
 License: LGPLv2+
 Url: http://git.0pointer.de/?p=libcanberra.git;a=summary
@@ -96,6 +97,7 @@ fi
 
 %prep
 %setup -q
+%patch0 -p1 -b .caillon
 
 %build
 %configure --disable-static --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso
@@ -162,6 +164,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Thu Mar 24 2011 Christopher Aillon <caillon@redhat.com> - 0.28-3
+- Workaround a hang (fdo#35024)
+
 * Tue Mar  1 2011 Bill Nottingham <notting@redhat.com> - 0.28-2
 - own gnome-settings-daemon desktop dir, don't require g-s-d