diff --git a/vinagre-0.3-no-password-crash.patch b/vinagre-0.3-no-password-crash.patch
new file mode 100644
index 0000000..c075cb8
--- /dev/null
+++ b/vinagre-0.3-no-password-crash.patch
@@ -0,0 +1,11 @@
+--- vinagre-0.3/src/vinagre-favorites.c.old	2007-10-25 16:27:57.000000000 +0100
++++ vinagre-0.3/src/vinagre-favorites.c	2007-10-25 16:28:08.000000000 +0100
+@@ -159,7 +159,7 @@ vinagre_favorites_add (VinagreConnection
+ 			      name,
+ 			      "port",
+ 			      conn->port);
+-      if (strlen(conn->password) > 0)
++      if (conn->password != NULL && strlen(conn->password) > 0)
+ 	g_key_file_set_string (favorites,
+ 			       name,
+ 			       "password",
diff --git a/vinagre.spec b/vinagre.spec
index 487a993..2496d71 100644
--- a/vinagre.spec
+++ b/vinagre.spec
@@ -1,12 +1,13 @@
 Name:		vinagre
 Version:	0.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	VNC client for the GNOME desktop
 
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://www.gnome.org/~jwendell/vinagre/
 Source0:	http://www.gnome.org/~jwendell/vinagre/downloads/%{name}-%{version}.tar.gz
+Patch0:		vinagre-0.3-no-password-crash.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,6 +27,7 @@ Vinagre is a VNC client for the GNOME desktop environment.
 
 %prep
 %setup -q
+%patch0 -p1 -b .no-pass-crash
 
 %build
 %configure --enable-avahi=yes
@@ -61,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc README NEWS COPYING AUTHORS
 
 %changelog
+* Thu Oct 25 2007 - Bastien Nocera <bnocera@redhat.com> - 0.3-2
+- Fix crasher when setting a favourite with no password (#352371)
+
 * Mon Sep 24 2007 - Bastien Nocera <bnocera@redhat.com> - 0.3-1
 - Update to 0.3