diff --git a/cyrus-sasl-2.1.23-race.patch b/cyrus-sasl-2.1.23-race.patch
new file mode 100644
index 0000000..a992fa6
--- /dev/null
+++ b/cyrus-sasl-2.1.23-race.patch
@@ -0,0 +1,16 @@
+diff -up cyrus-sasl-2.1.23/lib/common.c.race cyrus-sasl-2.1.23/lib/common.c
+--- cyrus-sasl-2.1.23/lib/common.c.race	2010-02-22 09:57:28.000000000 +0100
++++ cyrus-sasl-2.1.23/lib/common.c	2010-02-22 09:59:30.000000000 +0100
+@@ -794,7 +794,11 @@ void sasl_dispose(sasl_conn_t **pconn)
+   if (result!=SASL_OK) return;
+   
+   /* *pconn might have become NULL by now */
+-  if (! (*pconn)) return;
++  if (! (*pconn))
++  {
++	sasl_MUTEX_UNLOCK(free_mutex);
++	return;
++  }
+ 
+   (*pconn)->destroy_conn(*pconn);
+   sasl_FREE(*pconn);
diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index ae6f359..747c4da 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -9,7 +9,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.23
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -38,6 +38,7 @@ Patch33: cyrus-sasl-2.1.22-current-db.patch
 Patch34: cyrus-sasl-2.1.22-ldap-timeout.patch
 Patch35: cyrus-sasl-2.1.22-bad-elif.patch
 Patch36: cyrus-sasl-2.1.23-ac-quote.patch
+Patch37: cyrus-sasl-2.1.23-race.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
@@ -157,6 +158,7 @@ chmod -x include/*.h
 %patch34 -p1 -b .ldap-timeout
 %patch35 -p1 -b .elif
 %patch36 -p1 -b .ac-quote
+%patch37 -p1 -b .race
 
 %build
 # FIXME - we remove these files directly so that we can avoid using the -f
@@ -393,6 +395,9 @@ fi
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Mon Feb 22 2010 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-9
+- solve race condition (#566875)
+
 * Wed Feb 17 2010 Stepan Kasal <skasal@redhat.com> - 2.1.23-8
 - improve m4 quoting to fix saslauthd/configure (#566088)
 - call autotools in build, not in prep