diff --git a/at-spi2-atk-1.91.6-crasher-revert.patch b/at-spi2-atk-1.91.6-crasher-revert.patch
new file mode 100644
index 0000000..f19c806
--- /dev/null
+++ b/at-spi2-atk-1.91.6-crasher-revert.patch
@@ -0,0 +1,124 @@
+diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal at-spi2-atk-1.91.5/atk-adaptor/adaptors/component-adaptor.c at-spi2-atk-1.91.6/atk-adaptor/adaptors/component-adaptor.c
+--- at-spi2-atk-1.91.5/atk-adaptor/adaptors/component-adaptor.c	2010-06-23 13:20:49.000000000 +0000
++++ at-spi2-atk-1.91.6/atk-adaptor/adaptors/component-adaptor.c	2011-01-26 22:53:49.000000000 +0000
+@@ -291,6 +291,110 @@
+   return reply;
+ }
+ 
++static DBusMessage *
++impl_SetExtents (DBusConnection * bus, DBusMessage * message, void *user_data)
++{
++  AtkComponent *component = (AtkComponent *) user_data;
++  DBusMessageIter iter, iter_struct;
++  dbus_uint32_t coord_type;
++  dbus_int32_t x, y, width, height;
++  dbus_bool_t ret;
++  DBusMessage *reply;
++
++  g_return_val_if_fail (ATK_IS_COMPONENT (user_data),
++                        droute_not_yet_handled_error (message));
++
++  if (strcmp (dbus_message_get_signature (message), "(iiii)u") != 0)
++    {
++      return droute_invalid_arguments_error (message);
++    }
++
++  dbus_message_iter_init (message, &iter);
++  dbus_message_iter_recurse (&iter, &iter_struct);
++  dbus_message_iter_get_basic (&iter_struct, &x);
++  dbus_message_iter_next (&iter_struct);
++  dbus_message_iter_get_basic (&iter_struct, &y);
++  dbus_message_iter_next (&iter_struct);
++  dbus_message_iter_get_basic (&iter_struct, &width);
++  dbus_message_iter_next (&iter_struct);
++  dbus_message_iter_get_basic (&iter_struct, &height);
++  dbus_message_iter_next (&iter_struct);
++  dbus_message_iter_next (&iter);
++  dbus_message_iter_get_basic (&iter, &coord_type);
++
++  ret = atk_component_set_extents (component, x, y, width, height, coord_type);
++
++  reply = dbus_message_new_method_return (message);
++  if (reply)
++    {
++      dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &ret,
++                                DBUS_TYPE_INVALID);
++    }
++
++  return reply;
++}
++
++static DBusMessage *
++impl_SetPosition (DBusConnection * bus, DBusMessage * message, void *user_data)
++{
++  AtkComponent *component = (AtkComponent *) user_data;
++  dbus_uint32_t coord_type;
++  dbus_int32_t x, y;
++  dbus_bool_t ret;
++  DBusMessage *reply;
++
++  g_return_val_if_fail (ATK_IS_COMPONENT (user_data),
++                        droute_not_yet_handled_error (message));
++
++  if (!dbus_message_get_args
++      (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
++       DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
++    {
++      return droute_invalid_arguments_error (message);
++    }
++
++  ret = atk_component_set_position (component, x, y, coord_type);
++
++  reply = dbus_message_new_method_return (message);
++  if (reply)
++    {
++      dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &ret,
++                                DBUS_TYPE_INVALID);
++    }
++
++  return reply;
++}
++
++static DBusMessage *
++impl_SetSize (DBusConnection * bus, DBusMessage * message, void *user_data)
++{
++  AtkComponent *component = (AtkComponent *) user_data;
++  dbus_int32_t width, height;
++  dbus_bool_t ret;
++  DBusMessage *reply;
++
++  g_return_val_if_fail (ATK_IS_COMPONENT (user_data),
++                        droute_not_yet_handled_error (message));
++
++  if (!dbus_message_get_args
++      (message, NULL, DBUS_TYPE_INT32, &width, DBUS_TYPE_INT32, &height,
++       DBUS_TYPE_INVALID))
++    {
++      return droute_invalid_arguments_error (message);
++    }
++
++  ret = atk_component_set_size (component, width, height);
++
++  reply = dbus_message_new_method_return (message);
++  if (reply)
++    {
++      dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &ret,
++                                DBUS_TYPE_INVALID);
++    }
++
++  return reply;
++}
++
+ static DRouteMethod methods[] = {
+   {impl_contains, "contains"},
+   {impl_GetAccessibleAtPoint, "GetAccessibleAtPoint"},
+@@ -303,6 +407,9 @@
+   //{impl_registerFocusHandler, "registerFocusHandler"},
+   //{impl_deregisterFocusHandler, "deregisterFocusHandler"},
+   {impl_GetAlpha, "GetAlpha"},
++  {impl_SetExtents, "SetExtents"},
++  {impl_SetPosition, "SetPosition"},
++  {impl_SetSize, "SetSize"},
+   {NULL, NULL}
+ };
+ 
diff --git a/at-spi2-atk.spec b/at-spi2-atk.spec
index 73425f3..023fb83 100644
--- a/at-spi2-atk.spec
+++ b/at-spi2-atk.spec
@@ -1,6 +1,6 @@
 Name:           at-spi2-atk
 Version:        1.91.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A GTK+ module that bridges ATK to D-Bus at-spi
 
 Group:          System Environment/Libraries
@@ -20,6 +20,10 @@ BuildRequires:  intltool
 
 Requires:       at-spi2-core
 
+# Revert crasher that got into 1.91.6
+# https://bugzilla.gnome.org/show_bug.cgi?id=641338
+Patch0: at-spi2-atk-1.91.6-crasher-revert.patch
+
 %description
 at-spi allows assistive technologies to access GTK-based
 applications. Essentially it exposes the internals of applications for
@@ -36,6 +40,7 @@ D-Bus based at-spi.
 
 %prep
 %setup -q
+%patch0 -p1 -R -b .crasher
 
 %build
 %configure --disable-relocate
@@ -75,6 +80,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
 
 %changelog
+* Fri Feb 04 2011 Bastien Nocera <bnocera@redhat.com> 1.91.6-2
+- Revert crashy part of 1.91.6 release
+
 * Wed Feb  2 2011 Christopher Aillon <caillon@redhat.com> - 1.91.6-1
 - Update to 1.91.6
 
diff --git a/make-it-build.patch b/make-it-build.patch
deleted file mode 100644
index c3d60f1..0000000
--- a/make-it-build.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -up at-spi2-atk-0.1.5/atk-adaptor/adaptors/collection-adaptor.c.build at-spi2-atk-0.1.5/atk-adaptor/adaptors/collection-adaptor.c
---- at-spi2-atk-0.1.5/atk-adaptor/adaptors/collection-adaptor.c.build	2010-01-18 11:23:40.857577894 -0500
-+++ at-spi2-atk-0.1.5/atk-adaptor/adaptors/collection-adaptor.c	2010-01-18 11:26:16.918568256 -0500
-@@ -52,27 +52,27 @@ static gboolean
- child_interface_p (AtkObject * child, gchar * repo_id)
- {
-   if (!strcasecmp (repo_id, "action"))
--    return atk_is_action (child);
-+    return ATK_IS_ACTION (child);
-   if (!strcasecmp (repo_id, "component"))
--    return atk_is_component (child);
-+    return ATK_IS_COMPONENT (child);
-   if (!strcasecmp (repo_id, "editabletext"))
--    return atk_is_editable_text (child);
-+    return ATK_IS_EDITABLE_TEXT (child);
-   if (!strcasecmp (repo_id, "text"))
--    return atk_is_text (child);
-+    return ATK_IS_TEXT (child);
-   if (!strcasecmp (repo_id, "hypertext"))
--    return atk_is_hypertext (child);
-+    return ATK_IS_HYPERTEXT (child);
-   if (!strcasecmp (repo_id, "image"))
--    return atk_is_image (child);
-+    return ATK_IS_IMAGE (child);
-   if (!strcasecmp (repo_id, "selection"))
--    return atk_is_selection (child);
-+    return ATK_IS_SELECTION (child);
-   if (!strcasecmp (repo_id, "table"))
--    return atk_is_table (child);
-+    return ATK_IS_TABLE (child);
-   if (!strcasecmp (repo_id, "value"))
--    return atk_is_value (child);
-+    return ATK_IS_VALUE (child);
-   if (!strcasecmp (repo_id, "streamablecontent"))
--    return atk_is_streamable_content (child);
-+    return ATK_IS_STREAMABLE_CONTENT (child);
-   if (!strcasecmp (repo_id, "document"))
--    return atk_is_document (child);
-+    return ATK_IS_DOCUMENT (child);
-   return FALSE;
- }
- 
-diff -up at-spi2-atk-0.1.5/atk-adaptor/adaptors/component-adaptor.c.build at-spi2-atk-0.1.5/atk-adaptor/adaptors/component-adaptor.c
diff --git a/resident-module.patch b/resident-module.patch
deleted file mode 100644
index 316fb32..0000000
--- a/resident-module.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -up at-spi2-atk-0.3.90/atk-adaptor/bridge.c.resident-module at-spi2-atk-0.3.90/atk-adaptor/bridge.c
---- at-spi2-atk-0.3.90/atk-adaptor/bridge.c.resident-module	2010-08-15 19:23:09.000000000 -0400
-+++ at-spi2-atk-0.3.90/atk-adaptor/bridge.c	2010-08-27 15:43:12.153157998 -0400
-@@ -35,6 +35,7 @@
- #include <atk/atk.h>
- 
- #include <droute/droute.h>
-+#include <gmodule.h>
- 
- #include "bridge.h"
- #include "event.h"
-@@ -774,6 +775,14 @@ gtk_module_init (gint * argc, gchar ** a
-   return 0;
- }
- 
-+gchar*
-+g_module_check_init (GModule *module)
-+{
-+  g_module_make_resident (module);
-+
-+  return NULL;
-+}
-+
- void
- gnome_accessibility_module_init (void)
- {
diff --git a/tab-not-space.patch b/tab-not-space.patch
deleted file mode 100644
index 5289fb9..0000000
--- a/tab-not-space.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up at-spi2-atk-0.3.90/Makefile.tab-not-space at-spi2-atk-0.3.90/Makefile
---- at-spi2-atk-0.3.90/Makefile.tab-not-space	2010-08-27 15:45:49.587158000 -0400
-+++ at-spi2-atk-0.3.90/Makefile	2010-08-27 15:46:01.616158003 -0400
-@@ -820,7 +820,7 @@ uninstall-am: uninstall-schemasDATA
- %.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
- 
- install-data-local:
--                if test -z "$(DESTDIR)" ; then \
-+	if test -z "$(DESTDIR)" ; then \
-                         for p in $(schemas_DATA) ; do \
-                                 GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \
-                         done \