diff --git a/glib-networking-2.30.1.tar.bz2 b/glib-networking-2.30.1.tar.bz2
deleted file mode 100644
index 4a7af8e..0000000
--- a/glib-networking-2.30.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:81570b3131ca06e50b0bd01947baf3eb86023e399c5adb35515315d23b66f545
-size 369505
diff --git a/glib-networking-2.31.6.tar.xz b/glib-networking-2.31.6.tar.xz
new file mode 100644
index 0000000..3588e71
--- /dev/null
+++ b/glib-networking-2.31.6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c922ce88de37e9fa648200f381a4eddf1c99d8965da1d3a67eb00dbcb99f341
+size 320184
diff --git a/glib-networking.changes b/glib-networking.changes
index 46322b6..5157191 100644
--- a/glib-networking.changes
+++ b/glib-networking.changes
@@ -1,3 +1,59 @@
+-------------------------------------------------------------------
+Tue Dec 20 09:16:20 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 2.31.6:
+  + gnutls:
+    - Support gnutls built against nettle instead of gcrypt
+      (bgo#657306)
+    - Implement TLS session caching for GTlsServerConnection
+      (bgo#636574)
+  + tls/tests: Explicitly request the memory GSettings backend, to
+    avoid warnings in partial jhbuild environments.
+  + proxy/gnome: Update to use GInetAddressMask.
+  + Updated translations.
+- 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.
+
+-------------------------------------------------------------------
+Tue Nov 22 09:34:27 UTC 2011 - dimstar@opensuse.org
+
+- Update to version 2.31.2:
+  + gnutls:
+    - Added gnutls-pkcs11 backend, which uses gnutls 2.12.8 and
+      p11-kit (a new optional dependency) to provide access to
+      PKCS#11 tokens. At the moment, this is only enabled if you
+      set GIO_USE_TLS=gnutls-pkcs11 in the environment (bgo#656361)
+    - GTlsCertificateGnutls can now read unencrypted PKCS#8 keys
+      (which show "BEGIN PRIVATE KEY" in PEM form) in addition to
+      the previously-supported PKCS#1 keys ("BEGIN RSA PRIVATE
+      KEY").
+  + Updated translations.
+- Add pkgconfig(p11-kit-1) BuildRequires. New dependency.
+
+-------------------------------------------------------------------
+Tue Nov 15 14:15:53 UTC 2011 - dimstar@opensuse.org
+
+- Really enable parallel build: fix typo smp_flags => smp_mflags.
+
+-------------------------------------------------------------------
+Thu Oct 27 21:17:41 UTC 2011 - dimstar@opensuse.org
+
+- Update to version 2.31.0:
+  + Integrate fixes from 2.30.1.
+  + gnutls:
+    - Bumped required GNUTLS version to 2.11.0 and updated code for
+      that (bgo#656903).
+    - Added another G_TLS_ERROR_NOT_TLS (aka "dumb server, try
+      falling back from TLS to SSLv3") case, when the handshake
+      completes but then packets after that don't decrypt
+      correctly (bgo#662104).
+    - Made sure that GTlsConnection:peer-certificate and
+      :peer-certificate-errors get set even when the peer
+      certificate is rejected.
+  + proxy/gnome: build fixes (bgo#662203, bgo#662085).
+  + Updated translations.
+
 -------------------------------------------------------------------
 Tue Oct 18 06:23:19 UTC 2011 - vuntz@opensuse.org
 
diff --git a/glib-networking.spec b/glib-networking.spec
index ace9401..b9dca75 100644
--- a/glib-networking.spec
+++ b/glib-networking.spec
@@ -15,26 +15,27 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:           glib-networking
-Version:        2.30.1
-Release:        1
-License:        LGPLv2+
+Version:        2.31.6
+Release:        0
 Summary:        Network-related GIO modules for glib
+License:        LGPL-2.1+
 Group:          System/Libraries
-Source:         http://download.gnome.org/sources/glib-networking/2.30/%{name}-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/glib-networking/2.31/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
 # For directory ownership
 BuildRequires:  dbus-1
 BuildRequires:  intltool
 BuildRequires:  libgcrypt-devel
 BuildRequires:  translation-update-upstream
+# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
+BuildRequires:  xz
 # If this BuildRequires changes because of a gio library version change, change gio_real_package accordingly
-BuildRequires:  pkgconfig(gio-2.0) >= 2.29.18
-BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  pkgconfig(gio-2.0) >= 2.31.6
+BuildRequires:  pkgconfig(gnutls) >= 2.11.0
 BuildRequires:  pkgconfig(gsettings-desktop-schemas)
 BuildRequires:  pkgconfig(libproxy-1.0)
+BuildRequires:  pkgconfig(p11-kit-1) >= 0.8
 # org.gnome.system.proxy schema is used
 Requires:       gsettings-desktop-schemas
 Recommends:     %{name}-lang = %{version}
@@ -56,7 +57,7 @@ translation-update-upstream
 %configure \
     --disable-static \
     --with-ca-certificates=/etc/ssl/ca-bundle.pem
-%__make %{?_smp_flags} V=1
+%__make %{?_smp_mflags} V=1
 
 %install
 %makeinstall