diff --git a/esound-0.2.38-drain.patch b/esound-0.2.38-drain.patch
new file mode 100644
index 0000000..f2fb716
--- /dev/null
+++ b/esound-0.2.38-drain.patch
@@ -0,0 +1,11 @@
+--- esound-0.2.38/audio_alsa09.c.old	2007-06-11 12:22:24.000000000 +0200
++++ esound-0.2.38/audio_alsa09.c	2007-06-11 12:22:49.000000000 +0200
+@@ -486,7 +486,7 @@ void esd_audio_flush(void)
+ 	}
+ 
+ 	if (alsa_playback_handle != NULL)
+-		snd_pcm_drain( alsa_playback_handle );
++		snd_pcm_drop( alsa_playback_handle );
+   
+ 	if (alsadbg) 
+ 		print_state();
diff --git a/esound.spec b/esound.spec
index 1689a04..f0da576 100644
--- a/esound.spec
+++ b/esound.spec
@@ -2,7 +2,7 @@
 Summary: Allows several audio streams to play on a single audio device
 Name:    esound
 Version: 0.2.38
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch:   1
 License: LGPL
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/esound
@@ -12,6 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: esound-0.2.19-noerrors.patch
 Patch2: esound-0.2.35-64bit_install.patch
 Patch3: esound-multilib.patch
+Patch4: esound-0.2.38-drain.patch
 BuildRequires: docbook-utils
 BuildRequires: audiofile-devel
 BuildRequires: alsa-lib-devel
@@ -64,6 +65,7 @@ other resources needed to develop EsounD applications.
 %patch0 -p1 -b .noerrors
 %patch2 -p1 -b .64bit
 %patch3 -p1 -b .multilib
+%patch4 -p1 -b .drain-race
 
 %build
 %configure --disable-static
@@ -126,6 +128,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/esd-config.1.gz
 
 %changelog
+* Mon Jun 11 2007 - Bastien Nocera <bnocera@redhat.com> - 1:0.2.38-2
+- Patch from Martin Stransky <stransky@redhat.com> to work around
+  a race condition in snd_pcm_drain (#238680)
+
 * Tue May 08 2007 - Bastien Nocera <bnocera@redhat.com> - 1:0.2.38-1
 - New upstream release (#237487)
 - Fix not obsoleting older non-split versions of esound (#230631)