diff -Nru network-manager-applet-0.9.8.4/debian/changelog network-manager-applet-0.9.8.4/debian/changelog
--- network-manager-applet-0.9.8.4/debian/changelog	2014-02-19 17:31:09.000000000 +0000
+++ network-manager-applet-0.9.8.4/debian/changelog	2014-02-21 21:48:57.000000000 +0000
@@ -1,3 +1,11 @@
+network-manager-applet (0.9.8.4-1ubuntu4) trusty; urgency=medium
+
+  * debian/patches/git_dont_autostart_under_GNOME.patch:
+    - Re-added this patch to use AutostartCondition: launch nm-applet at
+      startup on gnome-but-not-shell sessions (LP: #1267100)
+
+ -- Matthieu Baerts (matttbe) <matttbe@ubuntu.com>  Fri, 21 Feb 2014 22:48:36 +0100
+
 network-manager-applet (0.9.8.4-1ubuntu3) trusty; urgency=medium
 
   * Add new patch to move on with enter in the country page of the new mobile
diff -Nru network-manager-applet-0.9.8.4/debian/patches/git_dont_autostart_under_GNOME.patch network-manager-applet-0.9.8.4/debian/patches/git_dont_autostart_under_GNOME.patch
--- network-manager-applet-0.9.8.4/debian/patches/git_dont_autostart_under_GNOME.patch	2014-02-19 17:31:09.000000000 +0000
+++ network-manager-applet-0.9.8.4/debian/patches/git_dont_autostart_under_GNOME.patch	2014-01-26 09:30:33.000000000 +0000
@@ -11,14 +11,23 @@
 ---
 (limited to 'nm-applet.desktop.in')
 
---- a/nm-applet.desktop.in
-+++ b/nm-applet.desktop.in
-@@ -9,6 +9,7 @@
- NotShowIn=KDE;
+Note: This patch should no longer be needed with the next 0.9.8.8 version
+thanks to the commit e192e83c1aa136512a9d4f026f81677799af8127
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1267100
+
+Index: network-manager-applet/nm-applet.desktop.in
+===================================================================
+--- network-manager-applet.orig/nm-applet.desktop.in	2014-01-08 13:55:44.677374794 +0100
++++ network-manager-applet/nm-applet.desktop.in	2014-01-08 13:55:44.673374794 +0100
+@@ -6,8 +6,10 @@
+ Terminal=false
+ Type=Application
+ NoDisplay=true
+-NotShowIn=KDE;GNOME;
++NotShowIn=KDE;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=NetworkManager
--X-GNOME-Bugzilla-Component=general
-+X-GNOME-Bugzilla-Component=nm-applet
- X-GNOME-Autostart-enabled=true
+ X-GNOME-Bugzilla-Component=nm-applet
++X-GNOME-Autostart-enabled=true
 +AutostartCondition=GNOME3 unless-session gnome
  X-GNOME-UsesNotifications=true
diff -Nru network-manager-applet-0.9.8.4/debian/patches/series network-manager-applet-0.9.8.4/debian/patches/series
--- network-manager-applet-0.9.8.4/debian/patches/series	2014-02-19 17:31:09.000000000 +0000
+++ network-manager-applet-0.9.8.4/debian/patches/series	2014-02-21 21:45:01.000000000 +0000
@@ -17,3 +17,4 @@
 lp1048520_delay_pin_dialog_in_greeter.patch
 rebuild_menu_after_init.patch
 0001_Move_on_with_enter_in_the_country_page_of_the_new_mobile_wizard.patch
+git_dont_autostart_under_GNOME.patch