diff --git a/.cvsignore b/.cvsignore
index 1d53bc3..962e4bd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-session-2.19.3.tar.bz2
+gnome-session-2.19.4.tar.bz2
diff --git a/gnome-session-2.17.91-atspi-timeout.patch b/gnome-session-2.17.91-atspi-timeout.patch
deleted file mode 100644
index 7d4a5a3..0000000
--- a/gnome-session-2.17.91-atspi-timeout.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- gnome-session-2.17.91/gnome-session/gsm-at-startup.c.timeout	2007-02-23 14:08:58.000000000 -0500
-+++ gnome-session-2.17.91/gnome-session/gsm-at-startup.c	2007-02-23 14:09:12.000000000 -0500
-@@ -88,11 +88,11 @@
-      gdk_window_set_events (w, GDK_PROPERTY_CHANGE_MASK);
-      gsm_assistive_tech_exec (command);
-      gdk_window_add_filter (w, gsm_assistive_filter_watch, &tid);
--     tid = g_timeout_add (5e3, gsm_assistive_filter_timeout, NULL);    
-+//     tid = g_timeout_add (5e3, gsm_assistive_filter_timeout, NULL);    
- 
-      gtk_main ();
- 
--     gdk_window_remove_filter (w, gsm_assistive_filter_watch, &tid);
-+//     gdk_window_remove_filter (w, gsm_assistive_filter_watch, &tid);
- 
-      g_free (command);
- }
diff --git a/gnome-session-2.19.4-atspi-timeout.patch b/gnome-session-2.19.4-atspi-timeout.patch
new file mode 100644
index 0000000..1817116
--- /dev/null
+++ b/gnome-session-2.19.4-atspi-timeout.patch
@@ -0,0 +1,20 @@
+--- gnome-session-2.19.4/gnome-session/gsm-at-startup.c.timeout	2007-06-17 18:21:51.000000000 -0400
++++ gnome-session-2.19.4/gnome-session/gsm-at-startup.c	2007-06-17 19:00:54.000000000 -0400
+@@ -65,13 +65,15 @@ gsm_assistive_registry_start (void)
+ 
+      gdk_window_set_events (w, GDK_PROPERTY_CHANGE_MASK);
+      gsm_exec_command_line_async (command, NULL);
++#if 0
+      gdk_window_add_filter (w, gsm_assistive_filter_watch, &tid);
+      tid = g_timeout_add_seconds (5, gsm_assistive_filter_timeout, NULL);    
+-
++#endif    
+      gtk_main ();
+ 
++#if 0
+      gdk_window_remove_filter (w, gsm_assistive_filter_watch, &tid);
+-
++#endif
+      g_free (command);
+ }
+ 
diff --git a/gnome-session.spec b/gnome-session.spec
index 267173f..ea1b334 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -1,6 +1,6 @@
 %define esound_version 0.2.26
 %define libgnomeui_version 2.3.0
-%define gtk2_version 2.3.1
+%define gtk2_version 2.11.3
 %define dbus_glib_version 0.70
 %define dbus_version 0.90
 %define gnome_keyring_version 0.5.1
@@ -11,7 +11,7 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.19.3
+Version: 2.19.4
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.19/%{name}-%{version}.tar.bz2
@@ -52,7 +52,7 @@ Patch9: gnome-session-2.13.4-no-crashes.patch
 Patch13: gnome-session-2.17.5-window-manager.patch
 
 # don't pop up the dialog as it can take longer than 5 seconds
-Patch20: gnome-session-2.17.91-atspi-timeout.patch
+Patch20: gnome-session-2.19.4-atspi-timeout.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=411506
 #Patch21: gnome-session-2.17.91-use-gdm-at-hints-3.patch
@@ -190,6 +190,9 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/session-properties.svg
 
 %changelog
+* Sun Jun 17 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.4-1
+- Update to 2.19.4
+
 * Mon Jun  4 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.3-1
 - Update to 2.19.3
 - Drop upstreamed patch
diff --git a/sources b/sources
index 8b1b8d6..e207785 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-20bdbfca2ef05b0ab93417ee617b0cb1  gnome-session-2.19.3.tar.bz2
+3a70b7ee6bee47dbeb935b28c00a7205  gnome-session-2.19.4.tar.bz2