diff --git a/pyatspi-0.1.5.tar.bz2 b/pyatspi-0.1.5.tar.bz2
new file mode 100644
index 0000000..d63a514
--- /dev/null
+++ b/pyatspi-0.1.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d05d72324c6186c8a74ac4a9edc37e5a496cd78d85b8b59cc585a75c83c995a1
+size 324968
diff --git a/pyatspi-0.1.6.tar.bz2 b/pyatspi-0.1.6.tar.bz2
deleted file mode 100644
index c788e7c..0000000
--- a/pyatspi-0.1.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:538ba7aa341dfe7aa1fc64339ad92cb9839867c77397a5af98169462398fd313
-size 323175
diff --git a/python-atspi-fix-no-gconf.patch b/python-atspi-fix-no-gconf.patch
new file mode 100644
index 0000000..81aef1e
--- /dev/null
+++ b/python-atspi-fix-no-gconf.patch
@@ -0,0 +1,25 @@
+Index: pyatspi-0.1.5/pyatspi/__init__.py
+===================================================================
+--- pyatspi-0.1.5.orig/pyatspi/__init__.py
++++ pyatspi-0.1.5/pyatspi/__init__.py
+@@ -13,14 +13,18 @@
+ #Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ 
+ try:
++    gconf = None
++    gconfClient = None
+     import gconf
+     gconfClient = gconf.client_get_default()
+     useCorba = gconfClient.get_bool("/desktop/gnome/interface/at-spi-corba")
+ except:
+     useCorba = False
+ finally:
+-    del gconfClient
+-    del gconf
++    if gconfClient:
++        del gconfClient
++    if gconf:
++        del gconf
+ 
+ if useCorba:
+     import sys
diff --git a/python-atspi.changes b/python-atspi.changes
index c0ba966..ce313fc 100644
--- a/python-atspi.changes
+++ b/python-atspi.changes
@@ -1,23 +1,3 @@
--------------------------------------------------------------------
-Fri Feb 12 15:05:03 CET 2010 - vuntz@opensuse.org
-
-- Update to version 0.1.6:
-  + Make AT-SPI/CORBA the default and relocate AT-SPI/D-Bus
-  + Move the application argument to the end of the event structure
-  + Enable Re-entrancy within pyatspi.
-  + Changes to properly update the cache and fix orca performance
-    issues
-  + Re-factor cache to use a single dictionary.
-  + Fix property getting to use the correct interfaces.
-  + Modify pyatspi to use the accessible object located on the
-    registryd.
-  + Fix an event bug
-  + bgo#607077 - pyatspi2: magic to detect whether to use corba
-    version or not can be broken
-- Drop python-atspi-fix-no-gconf.patch: fixed upstream.
-- Pass --disable-relocate to configure because we want at-spi2 by
-  default.
-
 -------------------------------------------------------------------
 Fri Jan 15 15:40:48 CET 2010 - vuntz@opensuse.org
 
diff --git a/python-atspi.spec b/python-atspi.spec
index 35a700f..52efdf2 100644
--- a/python-atspi.spec
+++ b/python-atspi.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package python-atspi (Version 0.1.6)
+# spec file for package python-atspi (Version 0.1.5)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,13 +19,15 @@
 
 Name:           python-atspi
 %define _name   pyatspi
-Version:        0.1.6
+Version:        0.1.5
 Release:        1
 Summary:        Assistive Technology Service Provider Interface - Python bindings
 License:        LGPLv2.0
 Group:          Development/Libraries/Python
 Url:            http://www.gnome.org/
 Source0:        %{_name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM python-atspi-fix-no-gconf.patch bgo#607077 vuntz@opensuse.org -- Make it work when gconf is not there
+Patch0:         python-atspi-fix-no-gconf.patch
 BuildRequires:  fdupes
 BuildRequires:  python
 Requires:       dbus-1-python
@@ -56,11 +58,10 @@ This package contains the python bindings for AT-SPI.
 
 %prep
 %setup -q -n %{_name}-%{version}
+%patch0 -p1
 
 %build
-# We pass --disable-relocate since we want at-spi2 by default.
-%configure \
-        --disable-relocate
+%configure
 %__make %{?jobs:-j%jobs}
 
 %install