diff --git a/vinagre-0.3-option-parse-crash.patch b/vinagre-0.3-option-parse-crash.patch
new file mode 100644
index 0000000..930453c
--- /dev/null
+++ b/vinagre-0.3-option-parse-crash.patch
@@ -0,0 +1,17 @@
+--- vinagre-0.3/src/vinagre-main.c.old	2007-11-23 13:16:43.000000000 +0000
++++ vinagre-0.3/src/vinagre-main.c	2007-11-23 13:20:03.000000000 +0000
+@@ -89,6 +89,14 @@ int main (int argc, char **argv) {
+   g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
+   g_option_context_add_group (context, gtk_get_option_group (TRUE));
+   g_option_context_parse (context, &argc, &argv, &error);
++  if (error)
++    {
++      g_print ("%s\n%s\n",
++	       error->message,
++	       _("Run 'vinagre --help' to see a full list of available command line options"));
++      g_error_free (error);
++      return 1;
++    }
+ 
+   if (!g_thread_supported ())
+     g_thread_init (NULL);
diff --git a/vinagre.spec b/vinagre.spec
index 2496d71..def3c88 100644
--- a/vinagre.spec
+++ b/vinagre.spec
@@ -1,6 +1,6 @@
 Name:		vinagre
 Version:	0.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	VNC client for the GNOME desktop
 
 Group:		Applications/System
@@ -8,6 +8,7 @@ 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
+Patch1:		vinagre-0.3-option-parse-crash.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,7 +29,7 @@ Vinagre is a VNC client for the GNOME desktop environment.
 %prep
 %setup -q
 %patch0 -p1 -b .no-pass-crash
-
+%patch1 -p1 -b .options-crash
 %build
 %configure --enable-avahi=yes
 make %{?_smp_mflags}
@@ -63,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc README NEWS COPYING AUTHORS
 
 %changelog
+* Fri Nov 23 2007 - Bastien Nocera <bnocera@redhat.com> - 0.3-3
+- Fix crasher when passing broken options on the command-line (#394671)
+
 * Thu Oct 25 2007 - Bastien Nocera <bnocera@redhat.com> - 0.3-2
 - Fix crasher when setting a favourite with no password (#352371)