diff --git a/.cvsignore b/.cvsignore
index 2c3906d..99e0324 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gajim-0.13.2.tar.bz2
+gajim-0.13.3.tar.bz2
diff --git a/gajim-0.13.3-gnome-keyring-CancelledError.patch b/gajim-0.13.3-gnome-keyring-CancelledError.patch
new file mode 100644
index 0000000..2fb50b4
--- /dev/null
+++ b/gajim-0.13.3-gnome-keyring-CancelledError.patch
@@ -0,0 +1,23 @@
+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
+
+Index: gajim-0.13.3/src/common/passwords.py
+===================================================================
+--- gajim-0.13.3.orig/src/common/passwords.py
++++ gajim-0.13.3/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):
+ 				storage = None
+ 		if storage is None:
+ 			if gajim.config.get('use_kwalletcli'):
diff --git a/gajim.spec b/gajim.spec
index ac3d724..fcb6327 100644
--- a/gajim.spec
+++ b/gajim.spec
@@ -1,12 +1,13 @@
 Summary:	Jabber client written in PyGTK
 Name:		gajim
 %global		majorver 0.13
-Version:	0.13.2
+Version:	0.13.3
 Release:	1%{?dist}
 License:	GPLv3
 Group:		Applications/Internet
 URL:		http://gajim.org/
 Source0:	http://gajim.org/downloads/%{majorver}/%{name}-%{version}.tar.bz2
+Patch0:		gajim-0.13.3-gnome-keyring-CancelledError.patch
 BuildArch:	noarch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -46,6 +47,7 @@ Gajim does not require GNOME to run, even though it exists with it nicely.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --docdir=%{_docdir}/%{name}-%{version} \
@@ -92,6 +94,10 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/src
 
 %changelog
+* Mon Mar 08 2010 Michal Schmidt <mschmidt@redhat.com> 0.13.3-1
+- Update to 0.13.3.
+- Add gajim-0.13.3-gnome-keyring-CancelledError.patch (RHBZ#556374).
+
 * Fri Feb 05 2010 Michal Schmidt <mschmidt@redhat.com> - 0.13.2-1
 - Version bump to 0.13.2. (RHBZ#541470)
 - 0.13.1 and 0.13.2 are bugfix releases.
diff --git a/sources b/sources
index cc60ea4..74b2dc5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-91606788f4d846b2d9c48abf8ec0781c  gajim-0.13.2.tar.bz2
+bedbc32147558207a3d9476d8b632fbb  gajim-0.13.3.tar.bz2