diff --git a/gajim-0.13.90-gnome-keyring-CancelledError.patch b/gajim-0.13.90-gnome-keyring-CancelledError.patch
deleted file mode 100644
index b93dfd8..0000000
--- a/gajim-0.13.90-gnome-keyring-CancelledError.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Newer gnome-keyring may raise CancelledError
-
-In such case let's continue without the keyring instead of crashing.
-
-
-  Patch attached to upstream trac ticket:
-  http://trac.gajim.org/ticket/5633
-  https://bugzilla.redhat.com/show_bug.cgi?id=556374
-    -- Michal
-
-Update 2010-08-19:
-I'm seeing IOError, perhaps because of a gnome-keyring bug. Added.
-
-Index: gajim-0.13.90/src/common/passwords.py
-===================================================================
---- gajim-0.13.90.orig/src/common/passwords.py
-+++ gajim-0.13.90/src/common/passwords.py
-@@ -197,7 +197,7 @@ def get_storage():
-         if USER_USES_GNOMEKEYRING:
-             try:
-                 storage = GnomePasswordStorage()
--            except (gnomekeyring.NoKeyringDaemonError, gnomekeyring.DeniedError):
-+            except (gnomekeyring.NoKeyringDaemonError, gnomekeyring.DeniedError, gnomekeyring.CancelledError, gnomekeyring.IOError):
-                 storage = None
-         if storage is None:
-             if gajim.config.get('use_kwalletcli'):
diff --git a/gajim-handle-canceling-of-creating-gnome-keyring.patch b/gajim-handle-canceling-of-creating-gnome-keyring.patch
new file mode 100644
index 0000000..2ce30da
--- /dev/null
+++ b/gajim-handle-canceling-of-creating-gnome-keyring.patch
@@ -0,0 +1,21 @@
+tree 6bbc5b769238
+parent 11dda9b52325
+author Yann Leboulanger <asterix@lagaule.org> 1284664512 -7200
+committer Yann Leboulanger <asterix@lagaule.org> 1284664512 -7200
+revision 12413
+branch default
+
+handle canceling of creating gnome keyring. Fixes #5909
+diff --git a/src/common/passwords.py b/src/common/passwords.py
+--- a/src/common/passwords.py
++++ b/src/common/passwords.py
+@@ -197,7 +197,8 @@
+         if USER_USES_GNOMEKEYRING:
+             try:
+                 storage = GnomePasswordStorage()
+-            except (gnomekeyring.NoKeyringDaemonError, gnomekeyring.DeniedError):
++            except (gnomekeyring.NoKeyringDaemonError, gnomekeyring.DeniedError,
++            gnomekeyring.CancelledError):
+                 storage = None
+         if storage is None:
+             if gajim.config.get('use_kwalletcli'):
diff --git a/gajim-prevent-traceback-when-receiving-strange-reply-to-iq_last.patch b/gajim-prevent-traceback-when-receiving-strange-reply-to-iq_last.patch
new file mode 100644
index 0000000..51962f7
--- /dev/null
+++ b/gajim-prevent-traceback-when-receiving-strange-reply-to-iq_last.patch
@@ -0,0 +1,25 @@
+Fix a traceback seen with jabber.el 0.8.0 on the other side.
+
+Backported from upstream patch:
+
+tree 6a41bf99daa0
+parent 44a33a30bdd8
+author Yann Leboulanger <asterix@lagaule.org> 1284146830 -7200
+committer Yann Leboulanger <asterix@lagaule.org> 1284146830 -7200
+revision 12406
+branch default
+
+prevent traceback when receiving strange reply to iq:last. Fixes #5898
+Index: gajim-0.14/src/common/connection_handlers.py
+===================================================================
+--- gajim-0.14.orig/src/common/connection_handlers.py
++++ gajim-0.14/src/common/connection_handlers.py
+@@ -819,6 +819,8 @@ class ConnectionHandlersBase:
+     def _LastResultCB(self, con, iq_obj):
+         log.debug('LastResultCB')
+         qp = iq_obj.getTag('query')
++        if not qp:
++            return
+         seconds = qp.getAttr('seconds')
+         status = qp.getData()
+         try:
diff --git a/gajim.spec b/gajim.spec
index a15adb6..d63a08d 100644
--- a/gajim.spec
+++ b/gajim.spec
@@ -2,13 +2,14 @@ Summary:	Jabber client written in PyGTK
 Name:		gajim
 %global		majorver 0.14
 Version:	0.14
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv3
 Group:		Applications/Internet
 URL:		http://gajim.org/
 Source0:	http://gajim.org/downloads/%{majorver}/%{name}-%{version}.tar.bz2
-Patch0:		gajim-0.13.90-gnome-keyring-CancelledError.patch
-Patch1:		gajim-0.13.90-pygtk-crash-python2.7-workaround.patch
+Patch0:		gajim-handle-canceling-of-creating-gnome-keyring.patch
+Patch1:		gajim-prevent-traceback-when-receiving-strange-reply-to-iq_last.patch
+Patch2:		gajim-0.13.90-pygtk-crash-python2.7-workaround.patch
 BuildArch:	noarch
 
 Requires:	avahi-ui-tools
@@ -60,6 +61,7 @@ Gajim does not require GNOME to run, even though it exists with it nicely.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure --docdir=%{_docdir}/%{name}-%{version}
@@ -113,6 +115,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/%{name}/src
 
 %changelog
+* Tue Sep 21 2010 Michal Schmidt <mschmidt@redhat.com> 0.14-4
+- Replace our gnome-keyring patch with one picked from upstream hg.
+- Prevent traceback when receiving strange reply to iq:last.
+
 * Mon Sep 20 2010 Michal Schmidt <mschmidt@redhat.com> 0.14-3
 - Require gstreamer-python too. (RHBZ#632927)