diff --git a/gjs-1.31.20.tar.xz b/gjs-1.31.20.tar.xz
deleted file mode 100644
index 1372c54..0000000
--- a/gjs-1.31.20.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4601f1423dbc0326529cba95cd0475a32ca62ee3215812665cf58e32080a9d11
-size 464588
diff --git a/gjs-1.31.22.tar.xz b/gjs-1.31.22.tar.xz
new file mode 100644
index 0000000..79115aa
--- /dev/null
+++ b/gjs-1.31.22.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bf40fd4e5fc9bcb0c67b180b1fbe5305f849f498793cd83009c6068927c3ec82
+size 464312
diff --git a/gjs-fix-build.patch b/gjs-fix-build.patch
deleted file mode 100644
index 4faf8ed..0000000
--- a/gjs-fix-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 4eaaa63f4b325f2476f90de52fea44dccd3bbc76
-Author: Vincent Untz <vuntz@gnome.org>
-Date:   Mon Mar 5 17:40:52 2012 +0100
-
-    object: Fix build
-    
-    https://bugzilla.gnome.org/show_bug.cgi?id=671390
-
-diff --git a/gi/object.c b/gi/object.c
-index 17c70b4..825c61f 100644
---- a/gi/object.c
-+++ b/gi/object.c
-@@ -1027,7 +1027,7 @@ object_instance_finalize(JSContext *context,
- 
-     TRACE(GJS_OBJECT_PROXY_FINALIZE(priv, priv->gobj,
-                                     priv->info ? g_base_info_get_namespace ( (GIBaseInfo*) priv->info) : "",
--                                    priv->info ? g_base_info_get_name ( (GIBaseInfo*) priv->info) ) : g_type_name(priv->gtype));
-+                                    priv->info ? g_base_info_get_name ( (GIBaseInfo*) priv->info) : g_type_name(priv->gtype)));
- 
-     if (priv->gobj) {
-         if (G_UNLIKELY (priv->gobj->ref_count <= 0)) {
diff --git a/gjs.changes b/gjs.changes
index 8969f8c..785663d 100644
--- a/gjs.changes
+++ b/gjs.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Mar 21 16:42:23 UTC 2012 - vuntz@opensuse.org
+
+- Update to version 1.31.22:
+  + Various bug fixes and code changes.
+  + Build fixes.
+- Remove xz BuildRequires now that it comes for free in the build
+  system.
+- Drop gjs-fix-build.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Mon Mar  5 15:44:07 UTC 2012 - vuntz@opensuse.org
 
diff --git a/gjs.spec b/gjs.spec
index c23488c..eb3496d 100644
--- a/gjs.spec
+++ b/gjs.spec
@@ -17,7 +17,7 @@
 
 
 Name:           gjs
-Version:        1.31.20
+Version:        1.31.22
 Release:        0
 # FIXME: find out if tapsets should really be in devel package or in main package
 Summary:        JavaScript bindings based on gobject-introspection and Mozilla
@@ -25,14 +25,10 @@ License:        MIT
 Group:          Development/Libraries/GNOME
 Url:            http://live.gnome.org/Gjs
 Source:         http://download.gnome.org/sources/gjs/1.31/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM gjs-fix-build.patch bgo#671390 vuntz@opensuse.org -- Fix code that cannot build
-Patch0:         gjs-fix-build.patch
 BuildRequires:  gcc-c++
 BuildRequires:  python
 BuildRequires:  readline-devel
 BuildRequires:  systemtap-sdt-devel
-# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
-BuildRequires:  xz
 BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.31.0
@@ -77,7 +73,6 @@ Mozilla SpiderMonkey JavaScript engine.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure \