diff --git a/gnome-settings-daemon-emit-power-signal-to-listeners.patch b/gnome-settings-daemon-emit-power-signal-to-listeners.patch
new file mode 100644
index 0000000..e07a8f7
--- /dev/null
+++ b/gnome-settings-daemon-emit-power-signal-to-listeners.patch
@@ -0,0 +1,25 @@
+From fffaf9c33100a82a55e8a8b438608347122dba69 Mon Sep 17 00:00:00 2001
+From: Gary Ching-Pang Lin <chingpang@gmail.com>
+Date: Fri, 14 Oct 2011 15:58:00 +0800
+Subject: [PATCH] power: Emit 'Changed' signal to all listeners
+
+---
+ plugins/power/gsd-power-manager.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
+index 4072c02..a5fc50d 100644
+--- a/plugins/power/gsd-power-manager.c
++++ b/plugins/power/gsd-power-manager.c
+@@ -336,7 +336,7 @@ engine_emit_changed (GsdPowerManager *manager)
+         if (manager->priv->connection == NULL)
+                 return;
+         ret = g_dbus_connection_emit_signal (manager->priv->connection,
+-                                             GSD_DBUS_SERVICE,
++                                             NULL,
+                                              GSD_POWER_DBUS_PATH,
+                                              GSD_POWER_DBUS_INTERFACE,
+                                              "Changed",
+-- 
+1.7.3.4
+
diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes
index 7409dbd..6e88168 100644
--- a/gnome-settings-daemon.changes
+++ b/gnome-settings-daemon.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Oct 14 08:08:06 UTC 2011 - glin@suse.com
+
+- Add gnome-settings-daemon-emit-power-signal-to-listeners.patch
+  to emit 'Changed' signal to all power plugin listeners. This
+  fixes the power indicator not working in gnome-shell (bnc#717814,
+  bgo#659908).
+
 -------------------------------------------------------------------
 Mon Sep 26 16:39:28 UTC 2011 - vuntz@opensuse.org
 
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 33fb6d6..554ce48 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -41,6 +41,8 @@ Patch14:        gnome-packagekit-fate302445.patch
 Patch15:        gnome-packagekit-BNC383261.patch
 # PATCH-FIX-OPENSUSE gnome-settings-daemon-stop-reload-proxy-settings.patch bnc689592#c1, bnc#538353 glin@suse.com -- Stop g-s-d poping up the authentication dialog for reloading the proxy settings
 Patch17:        gnome-settings-daemon-stop-reload-proxy-settings.patch
+# PATCH-FIX-UPSTREAM gnome-settings-daemon-emit-power-signal-to-listeners.patch bnc#717814, bgo#659908 glin@suse.com -- Emit 'Changed' signal to all power plugin listeners
+Patch18:        gnome-settings-daemon-emit-power-signal-to-listeners.patch
 BuildRequires:  fdupes
 BuildRequires:  gnome-common
 # Disabled because of the non-rebased patches
@@ -141,6 +143,7 @@ translation-update-upstream
 # PATCH-NEEDS-REBASE
 #%%patch15 -p0
 %patch17 -p1
+%patch18 -p1
 %endif
 
 %if 0%{?BUILD_FROM_VCS}