diff --git a/pulseaudio-use-correct-socket-for-esd-375701.patch b/pulseaudio-use-correct-socket-for-esd-375701.patch
deleted file mode 100644
index f7dffd2..0000000
--- a/pulseaudio-use-correct-socket-for-esd-375701.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr pulseaudio-0.9.10-orig/src/daemon/default.pa.in pulseaudio-0.9.10/src/daemon/default.pa.in
---- pulseaudio-0.9.10-orig/src/daemon/default.pa.in	2008-03-28 00:45:37.000000000 +0100
-+++ pulseaudio-0.9.10/src/daemon/default.pa.in	2008-05-06 12:32:18.689947000 +0200
-@@ -47,7 +47,7 @@ load-module module-detect
- 
- ### Load several protocols
- .ifexists module-esound-protocol-unix@PA_SOEXT@
--load-module module-esound-protocol-unix
-+load-module module-esound-protocol-unix socket="/tmp/.esd/socket"
- .endif
- load-module module-native-protocol-unix
- 
diff --git a/pulseaudio.changes b/pulseaudio.changes
index 51d075c..f772c59 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 19 14:04:00 CEST 2008 - rodrigo@suse.de
+
+- Removed pulseaudio-use-correct-socket-for-esd-375701.patch,
+  which conflicts with esound patch (bnc#391864) 
+
 -------------------------------------------------------------------
 Mon May 12 11:34:05 CEST 2008 - rodrigo@suse.de
 
diff --git a/pulseaudio.spec b/pulseaudio.spec
index bc24200..897264b 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:        17
+Release:        19
 License:        GPL v2 or later; LGPL v2.1 or later
 Group:          System/Sound Daemons
 Source:         %{name}-%{version}.tar.bz2
@@ -28,8 +28,6 @@ PreReq:         pwdutils
 Patch0:         pulseaudio-0.9.8-unbreak-tunnels.patch
 # PATCH-FIX-UPSTREAM pulseaudio-declarations.patch maw@novell.com -- Already fixed in git; will go away on the next release
 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
 
@@ -310,7 +308,6 @@ Authors:
 %setup -q -T -b0
 %patch0 -p1
 %patch1 -p0
-%patch2 -p1
 %patch3 -p1
 
 %build
@@ -527,6 +524,9 @@ groupadd -r pulse-access &>/dev/null || :
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Mon May 19 2008 rodrigo@suse.de
+- Removed pulseaudio-use-correct-socket-for-esd-375701.patch,
+  which conflicts with esound patch (bnc#391864)
 * Mon May 12 2008 rodrigo@suse.de
 - Added pulseaudio-defaults-daemon-conf.patch to set default
   values for better performance (bnc#381686)