diff --git a/at-spi2-core-2.1.90.tar.bz2 b/at-spi2-core-2.1.90.tar.bz2
deleted file mode 100644
index 60a567b..0000000
--- a/at-spi2-core-2.1.90.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8c293f7ad52ee7e233d759fbf0668a5fc84fc1e433576d2e823031bf363ff6e8
-size 515707
diff --git a/at-spi2-core-2.1.91.tar.bz2 b/at-spi2-core-2.1.91.tar.bz2
new file mode 100644
index 0000000..fae6462
--- /dev/null
+++ b/at-spi2-core-2.1.91.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:18db2cb606f8c4d2c1b421787c4910eb4cb6c1998b527620df6bf7c1ef0f3ee2
+size 517126
diff --git a/at-spi2-core-missing-return.patch b/at-spi2-core-missing-return.patch
new file mode 100644
index 0000000..d9cd6a5
--- /dev/null
+++ b/at-spi2-core-missing-return.patch
@@ -0,0 +1,30 @@
+commit 2634b72b59d18699353514348059c7d31aaf154c
+Author: Vincent Untz <vuntz@gnome.org>
+Date:   Tue Sep 6 08:21:22 2011 +0200
+
+    Fix missing return statements
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=658337
+
+diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c
+index 369998a..334258c 100644
+--- a/bus/at-spi-bus-launcher.c
++++ b/bus/at-spi-bus-launcher.c
+@@ -205,6 +205,8 @@ ensure_a11y_bus (A11yBusLauncher *app)
+   close (app->pipefd[0]);
+   close (app->pipefd[1]);
+   app->state = A11Y_BUS_STATE_ERROR;
++
++  return FALSE;
+ }
+ 
+ static void
+@@ -487,6 +489,8 @@ get_desktop_schema ()
+     if (!strcmp (schemas[i], "org.gnome.desktop.interface"))
+       return g_settings_new (schemas[i]);
+   }
++
++  return NULL;
+ }
+ 
+ static void
diff --git a/at-spi2-core.changes b/at-spi2-core.changes
index 0d4cf6e..2105262 100644
--- a/at-spi2-core.changes
+++ b/at-spi2-core.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Sep  6 06:09:38 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 2.1.91:
+  + Fixed a crash when deregistering event listeners.
+  + Made DBus IsEnabled property readwrite.
+- Add at-spi2-core-missing-return.patch: add missing returns to fix
+  build.
+
 -------------------------------------------------------------------
 Wed Aug 31 10:55:38 CEST 2011 - vuntz@opensuse.org
 
diff --git a/at-spi2-core.spec b/at-spi2-core.spec
index 826a33a..f57dac9 100644
--- a/at-spi2-core.spec
+++ b/at-spi2-core.spec
@@ -18,7 +18,7 @@
 
 
 Name:           at-spi2-core
-Version:        2.1.90
+Version:        2.1.91
 Release:        1
 Summary:        Assistive Technology Service Provider Interface - D-Bus based implementation
 License:        GPLv2+
@@ -26,6 +26,8 @@ Group:          System/Libraries
 Url:            http://www.gnome.org/
 Source0:        http://download.gnome.org/sources/at-spi2-core/2.1/%{name}-%{version}.tar.bz2
 Source99:       %{name}-rpmlintrc
+# PATCH-FIX-UPSTREAM at-spi2-core-missing-return.patch bgo#658337 vuntz@opensuse.org -- Missing returns
+Patch0:         at-spi2-core-missing-return.patch
 BuildRequires:  glib2-devel
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  intltool
@@ -68,11 +70,10 @@ Requires:       at-spi2-core = %{version}
 This package contains all necessary include files and libraries needed
 to develop applications that require these.
 
-
-
 %lang_package
 %prep
 %setup -q
+%patch0 -p1
 
 %if 0%{?BUILD_FROM_VCS}
 [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh