diff --git a/at-spi-1.18.0-deadlock.patch b/at-spi-1.18.0-deadlock.patch
new file mode 100644
index 0000000..1ee3c5a
--- /dev/null
+++ b/at-spi-1.18.0-deadlock.patch
@@ -0,0 +1,14 @@
+--- at-spi-1.18.0/atk-bridge/bridge.c.deadlock	2007-03-26 22:48:19.000000000 -0400
++++ at-spi-1.18.0/atk-bridge/bridge.c	2007-03-26 22:49:41.000000000 -0400
+@@ -47,9 +47,9 @@
+ #define DBG(a,b) if(_dbg>=(a))b
+ 
+ #define bridge_threads_leave() \
+-  if (!during_init_shutdown) atk_misc_threads_leave(misc)
++  if (!during_init_shutdown && !g_main_context_is_owner (NULL)) atk_misc_threads_leave(misc)
+ #define bridge_threads_enter() \
+-  if (!during_init_shutdown) atk_misc_threads_enter(misc)
++  if (!during_init_shutdown && !g_main_context_is_owner (NULL)) atk_misc_threads_enter(misc)
+ 
+ int _dbg = 0;
+ static CORBA_Environment ev;
diff --git a/at-spi.spec b/at-spi.spec
index f080e62..9983d30 100644
--- a/at-spi.spec
+++ b/at-spi.spec
@@ -8,9 +8,11 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.18.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: http://ftp.gnome.org/pub/gnome/sources/at-spi/1.18/%{name}-%{version}.tar.bz2
+# backport from upstream svn
+Patch0: at-spi-1.18.0-deadlock.patch
 
 License: LGPL
 Group: System Environment/Libraries
@@ -59,6 +61,7 @@ Libraries and header files allowing compilation of apps that use at-spi.
 
 %prep
 %setup -q
+%patch0 -p1 -b .deadlock
 
 %build
 %configure --disable-gtk-doc
@@ -98,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/* 
 
 %changelog
+* Mon Mar 26 2007 Matthias Clasen <mclasen@redhat.com> - 1.18.0-2
+- Backport a patch to fix deadlocks in applications
+
 * Tue Mar 13 2007 Matthias Clasen <mclasen@redhat.com> - 1.18.0-1
 - Update to 1.18.0
 - Drop obsolete patch