diff --git a/at-spi2-core-0.1.6.tar.bz2 b/at-spi2-core-0.1.6.tar.bz2
deleted file mode 100644
index 25c1548..0000000
--- a/at-spi2-core-0.1.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a52c0d23d8cf656f0cd6986394baebc1f0f60fc41b0a2c9ea80967b21c3c7277
-size 325920
diff --git a/at-spi2-core-0.1.8.tar.bz2 b/at-spi2-core-0.1.8.tar.bz2
new file mode 100644
index 0000000..abe2582
--- /dev/null
+++ b/at-spi2-core-0.1.8.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2bb33f5ccff315df5d5c1513502e31f186394346b3446f4be2396dad3b1da9d3
+size 281367
diff --git a/at-spi2-core-non_void.patch b/at-spi2-core-non_void.patch
new file mode 100644
index 0000000..543b03e
--- /dev/null
+++ b/at-spi2-core-non_void.patch
@@ -0,0 +1,34 @@
+--- registryd/registry.c
++++ registryd/registry.c
+@@ -99,6 +99,7 @@
+                                     &variant);
+     dbus_message_iter_append_basic (&variant, DBUS_TYPE_STRING, &str);
+   dbus_message_iter_close_container (iter, &variant);
++  return TRUE;
+ }
+ 
+ static void
+@@ -440,6 +441,7 @@
+   dbus_int32_t rv = reg->apps->len;
+ 
+   dbus_message_iter_append_basic (iter, DBUS_TYPE_INT32, &rv);
++  return TRUE;
+ }
+ 
+ static DBusMessage *
+@@ -755,6 +757,7 @@
+ {
+   emit_event (bus, SPI_DBUS_INTERFACE_EVENT_OBJECT, "ChildrenChanged", "add", index, 0,
+               name, path);
++  return TRUE;
+ }
+ 
+ static gboolean
+@@ -765,6 +768,7 @@
+ {
+   emit_event (bus, SPI_DBUS_INTERFACE_EVENT_OBJECT, "ChildrenChanged", "remove", index, 0,
+               name, SPI_DBUS_PATH_NULL);
++  return TRUE;
+ }
+ 
+ /*---------------------------------------------------------------------------*/
diff --git a/at-spi2-core.changes b/at-spi2-core.changes
index 1fdc678..b91965a 100644
--- a/at-spi2-core.changes
+++ b/at-spi2-core.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Wed Mar 31 01:23:13 CEST 2010 - vuntz@opensuse.org
+
+- Update to version 0.1.8:
+  + Quit if at-spi-dbus is disabled
+  + Call g_type_init()
+
+-------------------------------------------------------------------
+Tue Mar  2 00:38:02 CET 2010 - ro@suse.de
+
+- fix warning: no return statement in function returning non-void
+  in registry.c to fix build 
+
+-------------------------------------------------------------------
+Sun Feb 21 17:24:28 CET 2010 - vuntz@opensuse.org
+
+- Update to version 0.1.7:
+  + Completely re-work the protocol definitions.
+  + Make the desktop object and deviceeventcontroller
+    introspectable.
+  + Add the XML files to the distribution.
+  + Modify the interface name from org.freedesktop.atspi to
+    org.a11y.atspi.
+
 -------------------------------------------------------------------
 Fri Feb 12 15:05:12 CET 2010 - vuntz@opensuse.org
 
diff --git a/at-spi2-core.spec b/at-spi2-core.spec
index 968b196..c3a0242 100644
--- a/at-spi2-core.spec
+++ b/at-spi2-core.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package at-spi2-core (Version 0.1.6)
+# spec file for package at-spi2-core (Version 0.1.8)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,7 +18,7 @@
 
 
 Name:           at-spi2-core
-Version:        0.1.6
+Version:        0.1.8
 Release:        1
 # FIXME: check that tarballs > 0.1.6 ship bus/ directory, and if they do, reapply patch0 and call to suse_update_desktop_file
 Summary:        Assistive Technology Service Provider Interface - D-Bus based implementation
@@ -29,6 +29,8 @@ Source0:        %{name}-%{version}.tar.bz2
 Source99:       %{name}-rpmlintrc
 # PATCH-FIX-UPSTREAM at-spi2-core-dbus-path.patch vuntz@opensuse.org -- Use the right path for a dbus helper. This will be fixed upstream in a more generic way
 Patch0:         at-spi2-core-dbus-path.patch
+# PATCH-FIX-UPSTREAM at-spi2-core-non_void.patch fdo#26855 ro@novell.com -- Fix compiler warnings no-return-in-non-void-function.
+Patch1:         at-spi2-core-non_void.patch
 BuildRequires:  dbus-1-glib-devel
 BuildRequires:  glib2-devel
 BuildRequires:  xorg-x11-devel
@@ -50,6 +52,7 @@ with applications running on the desktop.
 
 %prep
 %setup -q
+%patch1
 # Reapply when bus/ is shipped again in the tarball
 #%patch0 -p1
 
@@ -79,7 +82,6 @@ rm -rf %{buildroot}
 %{_libexecdir}/at-spi2/
 #%{_sysconfdir}/at-spi2/
 #%{_sysconfdir}/xdg/autostart/at-spi-dbus-bus.desktop
-%{_datadir}/at-spi2/
-%{_datadir}/dbus-1/services/org.freedesktop.atspi.Registry.service
+%{_datadir}/dbus-1/services/org.a11y.atspi.Registry.service
 
 %changelog
diff --git a/ready b/ready
deleted file mode 100644
index 473a0f4..0000000