diff --git a/pidgin-nm09.patch b/pidgin-nm09.patch
new file mode 100644
index 0000000..7c8e849
--- /dev/null
+++ b/pidgin-nm09.patch
@@ -0,0 +1,38 @@
+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.changes b/pidgin.changes
index 0e71f14..2df3ae8 100644
--- a/pidgin.changes
+++ b/pidgin.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Apr 22 10:24:15 UTC 2011 - fcrozat@novell.com
+
+- Add pidgin-nm09.patch: fix compatibility with NM 0.9.
+
 -------------------------------------------------------------------
 Mon Apr  4 13:18:38 UTC 2011 - dimstar@opensuse.org
 
diff --git a/pidgin.spec b/pidgin.spec
index b7327f3..b05de4e 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -41,6 +41,8 @@ Patch5:         pidgin-nonblock-common2.patch
 Patch14:        pidgin-mono-buildfix.patch
 # PATCH-FIX-OPENSUSE pidgin-fix-perl-build.patch vuntz@opensuse.org -- Revert http://developer.pidgin.im/viewmtn/revision/info/f32151852a00fb5abd3fdccdd8df2419031666de as it breaks the build
 Patch15:        pidgin-fix-perl-build.patch
+# PATCH-FIX-UPSTREAM pidgin-nm09.patch fcrozat@novell.com -- Fix compatibility with NM 0.9 (upstream ticket 13505)
+Patch16:        pidgin-nm09.patch
 # Can use external libzephyr
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  dbus-1-devel
@@ -328,6 +330,7 @@ translation-update-upstream
 %patch5 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 # Change Myanmar/Myanmar to Myanmar:
 rename my_MM my po/my_MM.*
 %{__sed} -i "/ALL_LINGUAS/s/ my_MM / my /" configure.ac