diff --git a/.gitignore b/.gitignore
index aefe61b..a2122e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ pidgin-2.7.3.tar.bz2
 /pidgin-2.7.9.tar.bz2
 /pidgin-2.7.10.tar.bz2
 /pidgin-2.7.11.tar.bz2
+/pidgin-2.8.0.tar.bz2
diff --git a/nm09-pidgin.patch b/nm09-pidgin.patch
deleted file mode 100644
index 1c2471d..0000000
--- a/nm09-pidgin.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -up pidgin-2.7.10/libpurple/network.c.foo pidgin-2.7.10/libpurple/network.c
---- pidgin-2.7.10/libpurple/network.c.foo	2011-03-10 02:21:43.920933267 -0600
-+++ pidgin-2.7.10/libpurple/network.c	2011-03-10 02:23:11.466838793 -0600
-@@ -71,6 +71,10 @@
- #include <dbus/dbus-glib.h>
- #include <NetworkManager.h>
- 
-+#if !defined(NM_CHECK_VERSION)
-+#define NM_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- static DBusGConnection *nm_conn = NULL;
- static DBusGProxy *nm_proxy = NULL;
- static DBusGProxy *dbus_proxy = NULL;
-@@ -863,7 +867,13 @@ nm_update_state(NMState state)
- 
- 	switch(state)
- 	{
-+#if NM_CHECK_VERSION(0,8,992)
-+		case NM_STATE_CONNECTED_LOCAL:
-+		case NM_STATE_CONNECTED_SITE:
-+		case NM_STATE_CONNECTED_GLOBAL:
-+#else
- 		case NM_STATE_CONNECTED:
-+#endif
- 			/* Call res_init in case DNS servers have changed */
- 			res_init();
- 			/* update STUN IP in case we it changed (theoretically we could
-@@ -880,6 +890,9 @@ nm_update_state(NMState state)
- 		case NM_STATE_ASLEEP:
- 		case NM_STATE_CONNECTING:
- 		case NM_STATE_DISCONNECTED:
-+#if NM_CHECK_VERSION(0,8,992)
-+		case NM_STATE_DISCONNECTING:
-+#endif
- 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
- 				break;
- 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
diff --git a/pidgin-2.8.0-gevolution-compilefix.patch b/pidgin-2.8.0-gevolution-compilefix.patch
new file mode 100644
index 0000000..c11fe62
--- /dev/null
+++ b/pidgin-2.8.0-gevolution-compilefix.patch
@@ -0,0 +1,20 @@
+#
+#
+# patch "pidgin/plugins/gevolution/gevolution.c"
+#  from [e82d07077f62e85a1e318e1f77fb093b2502e1a2]
+#    to [f19cde741adeff1f88065dbd4c7580a49eed80ce]
+#
+============================================================
+--- pidgin/plugins/gevolution/gevolution.c	e82d07077f62e85a1e318e1f77fb093b2502e1a2
++++ pidgin/plugins/gevolution/gevolution.c	f19cde741adeff1f88065dbd4c7580a49eed80ce
+@@ -447,8 +447,8 @@ get_config_frame(PurplePlugin *plugin)
+ 	treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
+ 	gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview), TRUE);
+ 	gtk_box_pack_start(GTK_BOX(vbox),
+-		pidgin_make_scrollable(treeview, GTK_POLICY_AUTO, GTK_POLICY_ALWAYS, GTK_SHADOW_IN, 300, 300),
+-		TRUE, TRUE, 0);
++			pidgin_make_scrollable(treeview, GTK_POLICY_AUTOMATIC,
++			GTK_POLICY_ALWAYS, GTK_SHADOW_IN, 300, 300), TRUE, TRUE, 0);
+ 	gtk_widget_show(treeview);
+ 
+ 	/* Setup the column */
diff --git a/pidgin.spec b/pidgin.spec
index 3f9c48a..8c3d3b9 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -97,8 +97,8 @@
 %endif
 
 Name:           pidgin
-Version:        2.7.11
-Release:        3%{?dist}
+Version:        2.8.0
+Release:        1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -134,8 +134,8 @@ Patch0:         pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
 
 ## Patches 100+: To be Included in Future Upstream
 Patch100:       pidgin-2.7.7-msn-disable-msnp16.patch
-Patch101: nm09-pidgin.patch
-Patch102: nm09-more.patch
+Patch101:       nm09-more.patch
+Patch102:       pidgin-2.8.0-gevolution-compilefix.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 Summary:        A Gtk+ based multiprotocol instant messaging client
@@ -417,10 +417,10 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 # from the official client (and possibly file transfers)
 %patch100 -p0 -b .msnp16
 
-# http://developer.pidgin.im/ticket/13505
-%patch101 -p1 -b .nm09
 # http://developer.pidgin.im/ticket/13859
-%patch102 -p1 -b .nm09more
+%patch101 -p1 -b .nm09more
+# http://developer.pidgin.im/viewmtn/revision/info/aebefd6d98382ce0f7b42b41e4bf2611044d4182
+%patch102 -p0 -b .gevocompile
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -683,6 +683,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Jun 13 2011 Stu Tomlinson <stu@nosnilmot.com> 2.8.0-1
+- 2.8.0
+
+* Fri May 20 2011 Kalev Lember <kalev@smartlink.ee> 2.7.11-4
+- Rebuilt for libcamel soname bump
+
 * Tue Apr 26 2011 Dan Williams <dcbw@redhat.com> 2.7.11-3
 - A few more NetworkManager 0.9 fixes
 
diff --git a/sources b/sources
index 291a231..90fdb3f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-07c2a2535b4d7436b5ec7685fe063fec  pidgin-2.7.11.tar.bz2
+d1656c443a5d91f4aa0d95915f1f50c3  pidgin-2.8.0.tar.bz2