diff --git a/gjs-1.30.0.tar.bz2 b/gjs-1.30.0.tar.bz2
deleted file mode 100644
index 70481c6..0000000
--- a/gjs-1.30.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9c0dc1fc883b3c46cbc514bcfb577ec01eac45c934c6d07a06cdb12a2b2931ef
-size 545836
diff --git a/gjs-1.31.6.tar.xz b/gjs-1.31.6.tar.xz
new file mode 100644
index 0000000..d8d8c4a
--- /dev/null
+++ b/gjs-1.31.6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d4a3628c651675f98dc2f2121cdf113611cc1f8ba0c326b3c7c8063240ba61b4
+size 454072
diff --git a/gjs.changes b/gjs.changes
index 67d284b..dfdedcc 100644
--- a/gjs.changes
+++ b/gjs.changes
@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Sat Dec 24 14:09:35 UTC 2011 - vuntz@opensuse.org
+
+- Split typelib file into typelib-1_0-GjsDBus-1_0 subpackage.
+- Add typelib-1_0-GjsDBus-1_0 Requires to devel subpackage.
+
+-------------------------------------------------------------------
+Tue Dec 20 20:34:37 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 1.31.6:
+  + Require mozjs185.
+  + Add a common way to grab a GType for an object
+  + Some work to improve support for ParamSpec.
+  + lang:
+    - Add new "Class" framework adapted from MooTools
+    - Improve prototype property descriptors
+    - Introduce abstract classes
+    - Fix for reentrant calls
+  + console: Fix ARGV when using -c to specify program
+  + Several overrides improvements.
+  + Various other code changes.
+- Remove %build_with_xulrunner define: only building against
+  mozjs185 is supported now.
+- Add xz BuildRequires because we can't build a package for a
+  xz-compressed tarball without explicitly specifying that... See
+  bnc#697467 for more details.
+
+-------------------------------------------------------------------
+Fri Oct 28 07:55:21 UTC 2011 - dimstar@opensuse.org
+
+- Update to version 1.31.0:
+  + Fix memory leaks
+  + Don't use deprecated g_thread_init() and gvalue calls.
+  + Fix compiler warnings.
+- Add pkgconfig(glib-2.0) BuildRequires.
+
 -------------------------------------------------------------------
 Tue Sep 27 19:25:01 UTC 2011 - vuntz@opensuse.org
 
diff --git a/gjs.spec b/gjs.spec
index 066ba9b..e698706 100644
--- a/gjs.spec
+++ b/gjs.spec
@@ -15,34 +15,26 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-# Set to 1 to build with xulrunner, else we build with js
-%define build_with_xulrunner 0
-
-%define xulrunner_ver 20
-
 Name:           gjs
-Version:        1.30.0
-Release:        1
+Version:        1.31.6
+Release:        0
 # FIXME: find out if tapsets should really be in devel package or in main package
-License:        MIT License (or similar)
 Summary:        JavaScript bindings based on gobject-introspection and Mozilla
+License:        MIT
 Group:          Development/Libraries/GNOME
 Url:            http://live.gnome.org/Gjs
-Source:         http://download.gnome.org/sources/gjs/1.30/%{name}-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/gjs/1.31/%{name}-%{version}.tar.xz
 BuildRequires:  gcc-c++
-%if %{build_with_xulrunner}
-BuildRequires:  mozilla-xulrunner%{xulrunner_ver}-devel
-%endif
 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
 BuildRequires:  pkgconfig(gobject-introspection-1.0) >= 1.29.16
-%if ! %{build_with_xulrunner}
 BuildRequires:  pkgconfig(mozjs185)
-%endif
 Requires:       libgjs0 = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -51,14 +43,8 @@ This module contains JavaScript bindings based on gobject-introspection and the
 Mozilla SpiderMonkey JavaScript engine.
 
 %package -n libgjs0
-License:        MIT License (or similar)
 Summary:        JavaScript bindings based on gobject-introspection and Mozilla
 Group:          Development/Libraries/GNOME
-%if %{build_with_xulrunner}
-# Explicitly requires the xulrunner version we need, instead of hoping we'll
-# get the right one with the libmozjs.so Requires.
-Requires:       mozilla-xulrunner%{xulrunner_ver}
-%endif
 Provides:       libgjs-0 = %{version}
 Obsoletes:      libgjs-0 < %{version}
 
@@ -66,14 +52,19 @@ Obsoletes:      libgjs-0 < %{version}
 This module contains JavaScript bindings based on gobject-introspection and the
 Mozilla SpiderMonkey JavaScript engine.
 
+%package -n typelib-1_0-GjsDBus-1_0
+Summary:        GJS DBus utility library -- Introspection bindings
+Group:          Development/Libraries/GNOME
+
+%description -n typelib-1_0-GjsDBus-1_0
+This module contains JavaScript bindings based on gobject-introspection and the
+Mozilla SpiderMonkey JavaScript engine.
+
 %package -n libgjs-devel
-License:        MIT License (or similar)
 Summary:        JavaScript bindings based on gobject-introspection and Mozilla
 Group:          Development/Libraries/GNOME
 Requires:       libgjs0 = %{version}
-%if %{build_with_xulrunner}
-Requires:       mozilla-xulrunner%{xulrunner_ver}-devel
-%endif
+Requires:       typelib-1_0-GjsDBus-1_0
 # Just a helper provides
 Provides:       gjs-devel = %{version}
 
@@ -114,9 +105,12 @@ rm -rf %{buildroot}
 %{_datadir}/gjs-1.0/
 %{_libdir}/*.so.*
 %dir %{_libdir}/gjs
-%{_libdir}/gjs/GjsDBus-1.0.typelib
 %{_libdir}/gjs-1.0/
 
+%files -n typelib-1_0-GjsDBus-1_0
+%defattr(-,root,root)
+%{_libdir}/gjs/GjsDBus-1.0.typelib
+
 %files -n libgjs-devel
 %defattr(-,root,root)
 %{_includedir}/*