diff --git a/pidgin-2.5.1-gnomeproxy.patch b/pidgin-2.5.1-gnomeproxy.patch
new file mode 100644
index 0000000..f25b453
--- /dev/null
+++ b/pidgin-2.5.1-gnomeproxy.patch
@@ -0,0 +1,40 @@
+-----------------------------------------------------------------
+Revision: f32f9fb19ff7b4685994c4120991d00386efee39
+Ancestor: d8efe65e6fb17e66001bd2d37b7e05bf864e44cc
+Author: nosnilmot@pidgin.im
+Date: 2008-09-16T13:04:39
+Branch: im.pidgin.pidgin
+
+Modified files:
+        libpurple/proxy.c
+
+ChangeLog: 
+
+Fix a double free. Fixes #7047
+
+============================================================
+--- libpurple/proxy.c	b7dbb41f68625d6ea47613e3198d6ddfe6d382a9
++++ libpurple/proxy.c	67a1948a059b1f6d1f69ac9a5c3aa6fba3a083c5
+@@ -263,13 +263,17 @@ purple_gnome_proxy_get_info(void)
+ 		use_same_proxy = TRUE;
+ 	g_free(tmp);
+ 
+-	if (!use_same_proxy && !g_spawn_command_line_sync("gconftool-2 -g /system/proxy/socks_host",
++	if (!use_same_proxy) {
++		if (!g_spawn_command_line_sync("gconftool-2 -g /system/proxy/socks_host",
+ 			&info.host, &err, NULL, NULL))
+-		return purple_global_proxy_get_info();
+-	g_free(err);
+-	g_strchomp(info.host);
++			return purple_global_proxy_get_info();
++		g_free(err);
++	}
+ 
+-	if (!use_same_proxy && *info.host != '\0') {
++	if(info.host != NULL)
++		g_strchomp(info.host);
++
++	if (!use_same_proxy && (info.host != NULL) && (*info.host != '\0')) {
+ 		info.type = PURPLE_PROXY_SOCKS5;
+ 		if (!g_spawn_command_line_sync("gconftool-2 -g /system/proxy/socks_port",
+ 				&tmp, &err, NULL, NULL))
diff --git a/pidgin.spec b/pidgin.spec
index 076ac08..df2f85a 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -29,7 +29,7 @@
 
 Name:		pidgin
 Version:	2.5.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -62,6 +62,7 @@ Source1:	purple-fedora-prefs.xml
 Patch0: pidgin-2.4.2-reread-resolvconf.patch
 
 ## Patches 100+: To be Included in Future Upstream
+Patch100:       pidgin-2.5.1-gnomeproxy.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -291,6 +292,7 @@ and plugins.
 %patch0 -p1 -b .resolv
 
 ## Patches 100+: To be Included in Future Upstream
+%patch100 -p1 -b .gnomeproxy
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -500,6 +502,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 16 2008 Stu Tomlinson <stu@nosnilmot.com> 2.5.1-2
+- Fix a crash with GNOME proxy enabled (#461951)
+
 * Sun Aug 31 2008 Stu Tomlinson <stu@nosnilmot.com> 2.5.1-1
 - 2.5.1