diff --git a/empathy-connect-on-passwd-retrieval.patch b/empathy-connect-on-passwd-retrieval.patch
new file mode 100644
index 0000000..d69954f
--- /dev/null
+++ b/empathy-connect-on-passwd-retrieval.patch
@@ -0,0 +1,24 @@
+From 9a338b84bfe496b9a244faa4820ed46f94f00092 Mon Sep 17 00:00:00 2001
+From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+Date: Tue, 07 Jun 2011 09:39:38 +0000
+Subject: account-widget: use tp_g_signal_connect_object to connect on the password-retrieved signal (#652015)
+
+Thanks to Roland Dreier for the original patch.
+---
+diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
+index b562cf1..9d9e1f3 100644
+--- a/libempathy-gtk/empathy-account-widget.c
++++ b/libempathy-gtk/empathy-account-widget.c
+@@ -2229,8 +2229,8 @@ do_constructed (GObject *obj)
+           /* The password might not have been retrieved from the
+            * keyring yet. We should update the remember password
+            * toggle button and the password entry when/if it is. */
+-          g_signal_connect (priv->settings, "password-retrieved",
+-              G_CALLBACK (account_settings_password_retrieved_cb), self);
++          tp_g_signal_connect_object (priv->settings, "password-retrieved",
++              G_CALLBACK (account_settings_password_retrieved_cb), self, 0);
+         }
+ 
+       g_signal_connect (priv->remember_password_widget, "toggled",
+--
+cgit v0.9
diff --git a/empathy.spec b/empathy.spec
index e5ccad3..6969963 100644
--- a/empathy.spec
+++ b/empathy.spec
@@ -13,7 +13,7 @@
 
 Name:		empathy
 Version:	3.0.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -22,6 +22,7 @@ URL:		http://live.gnome.org/Empathy
 
 Source0:	http://download.gnome.org/sources/%{name}/3.0/%{name}-%{version}.tar.bz2
 Source1:	%{name}-README.ConnectionManagers
+Patch0:		%{name}-connect-on-passwd-retrieval.patch
 
 BuildRequires:	enchant-devel >= %{enchant_version}
 BuildRequires:	iso-codes-devel
@@ -79,6 +80,7 @@ It is built on top of the Telepathy framework.
 
 %prep
 %setup -q
+%patch0 -p1 -b .passwd
 # force this to be regenerated
 rm data/empathy.desktop
 
@@ -156,6 +158,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %changelog
+* Wed Jun  8 2011 Brian Pepple <bpepple@fedoraproject.org> - 3.0.2-2
+- Backport patch to fix crash in empathy-accounts. (#698148)
+
 * Mon May 23 2011 Brian Pepple <bpepple@fedoraproject.org> - 3.0.2-1
 - Update to 3.0.2.