diff --git a/compat-crash.patch b/compat-crash.patch
new file mode 100644
index 0000000..ec5e4c4
--- /dev/null
+++ b/compat-crash.patch
@@ -0,0 +1,12 @@
+diff -up gnome-session-2.23.6/compat/at-spi-registryd-wrapper.c.crash gnome-session-2.23.6/compat/at-spi-registryd-wrapper.c
+--- gnome-session-2.23.6/compat/at-spi-registryd-wrapper.c.crash	2008-08-12 10:07:48.000000000 -0400
++++ gnome-session-2.23.6/compat/at-spi-registryd-wrapper.c	2008-08-12 10:10:15.000000000 -0400
+@@ -98,7 +98,7 @@ set_gtk_modules (DBusGProxy *gsm)
+                 modules[i] = NULL;
+ 
+                 value = g_strjoinv (":", modules);
+-                g_strfreev (modules);
++                g_free (modules);
+         } else {
+                 value = g_strdup ("gail:atk-bridge");
+         }
diff --git a/gnome-session.spec b/gnome-session.spec
index dae1142..3700761 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.23.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.23/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -63,7 +63,10 @@ Requires(pre): GConf2 >= %{gconf2_version}
 Requires(post): GConf2 >= %{gconf2_version}
 Requires(preun): GConf2 >= %{gconf2_version}
 
+# fixed upstream
 Patch0: icon-name.patch
+# fixed upstream
+Patch1: compat-crash.patch
 
 %description
 
@@ -73,6 +76,7 @@ GNOME components and handles logout and saving the session.
 %prep
 %setup -q
 %patch0 -p1 -b .icon-name
+%patch1 -p1 -b .compat-crash
 
 %build
 
@@ -167,6 +171,9 @@ fi
 
 
 %changelog
+* Tue Aug 12 2008 Matthias Clasen  <mclasen@redhat.com> - 2.23.6-3
+- Fix a crash in the at-spi-registryd-wrapper
+
 * Thu Aug  7 2008 Matthias Clasen  <mclasen@redhat.com> - 2.23.6-2
 - Fix another icon name