diff --git a/pulseaudio-defaults-daemon-conf.patch b/pulseaudio-defaults-daemon-conf.patch
new file mode 100644
index 0000000..96dd4d5
--- /dev/null
+++ b/pulseaudio-defaults-daemon-conf.patch
@@ -0,0 +1,10 @@
+--- a/src/daemon/daemon.conf.in	2008-01-24 06:14:22.000000000 +0530
++++ b/src/daemon/daemon.conf.in.new	2008-05-11 14:02:03.000000000 +0530
+@@ -65,5 +65,5 @@
+ ; default-sample-rate = 44100
+ ; default-sample-channels = 2
+ 
+-; default-fragments = 4
+-; default-fragment-size-msec = 25
++ default-fragments = 16
++ default-fragment-size-msec = 21
diff --git a/pulseaudio.changes b/pulseaudio.changes
index 79d7056..51d075c 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 12 11:34:05 CEST 2008 - rodrigo@suse.de
+
+- Added pulseaudio-defaults-daemon-conf.patch to set default
+  values for better performance (bnc#381686) 
+
 -------------------------------------------------------------------
 Tue May  6 12:47:42 CEST 2008 - rodrigo@suse.de
 
diff --git a/pulseaudio.spec b/pulseaudio.spec
index d6a743c..bc24200 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -15,7 +15,7 @@ Name:           pulseaudio
 %define drvver 0.9
 Summary:        A Networked Sound Server
 Version:        0.9.10
-Release:        12
+Release:        17
 License:        GPL v2 or later; LGPL v2.1 or later
 Group:          System/Sound Daemons
 Source:         %{name}-%{version}.tar.bz2
@@ -30,6 +30,8 @@ Patch0:         pulseaudio-0.9.8-unbreak-tunnels.patch
 Patch1:         pulseaudio-declarations.patch
 # PATCH-FIX-OPENSUSE pulseaudio-use-correct-socket-for-esd-375701.patch bnc375701 rodrigo@novell.com
 Patch2:         pulseaudio-use-correct-socket-for-esd-375701.patch
+# PATCH FIX-UPSTREAM pulseaudio-defaults-daemon-conf.patch
+Patch3:         pulseaudio-defaults-daemon-conf.patch
 
 %description
 pulseaudio is a networked sound server for Linux and other Unix like
@@ -309,6 +311,7 @@ Authors:
 %patch0 -p1
 %patch1 -p0
 %patch2 -p1
+%patch3 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@@ -524,6 +527,9 @@ groupadd -r pulse-access &>/dev/null || :
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Mon May 12 2008 rodrigo@suse.de
+- Added pulseaudio-defaults-daemon-conf.patch to set default
+  values for better performance (bnc#381686)
 * Tue May 06 2008 rodrigo@suse.de
 - Added pulseaudio-use-correct-socket-for-esd-375701.patch to
   use correct esound socket (bnc375701)