diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8d44042
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+SOURCES/gnome-settings-daemon-3.8.6.1.tar.xz
diff --git a/SOURCES/0001-power-Check-that-the-output-is-connected-when-determ.patch b/SOURCES/0001-power-Check-that-the-output-is-connected-when-determ.patch
new file mode 100644
index 0000000..edc24cd
--- /dev/null
+++ b/SOURCES/0001-power-Check-that-the-output-is-connected-when-determ.patch
@@ -0,0 +1,38 @@
+From 47af2a6b8349a3edbea7aab2152d859d6c4c23bd Mon Sep 17 00:00:00 2001
+From: Rui Matos <tiagomatos@gmail.com>
+Date: Mon, 28 Apr 2014 21:56:51 +0200
+Subject: [PATCH] power: Check that the output is connected when determining if
+ it's ON
+
+It might happen that there's no device connected and yet the CRTC
+associated with an output has a valid mode.
+
+RRGetOutputInfo tells us if the hardware was able to detect a device
+connected to the output so let's use that.
+
+Note that in versions newer than 3.8, this check isn't required since
+the list of outputs that we get from mutter's DisplayConfig interface
+is already filtered by mutter and doesn't contain any disconnected
+outputs.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1081093
+---
+ plugins/power/gpm-common.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/plugins/power/gpm-common.c b/plugins/power/gpm-common.c
+index b1ce32a..70e4591 100644
+--- a/plugins/power/gpm-common.c
++++ b/plugins/power/gpm-common.c
+@@ -1694,6 +1694,8 @@ randr_output_is_on (GnomeRROutput *output)
+ {
+         GnomeRRCrtc *crtc;
+ 
++        if (!gnome_rr_output_is_connected (output))
++                return FALSE;
+         crtc = gnome_rr_output_get_crtc (output);
+         if (!crtc)
+                 return FALSE;
+-- 
+1.9.0
+
diff --git a/SPECS/gnome-settings-daemon.spec b/SPECS/gnome-settings-daemon.spec
index 3abea04..f9ed4ab 100644
--- a/SPECS/gnome-settings-daemon.spec
+++ b/SPECS/gnome-settings-daemon.spec
@@ -1,6 +1,6 @@
 Name:           gnome-settings-daemon
 Version:        3.8.6.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:          System Environment/Daemons
@@ -21,6 +21,8 @@ Patch5:         0003-media-keys-Allow-the-power-key-in-more-places.patch
 Patch6:         translations.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1047921
 Patch7:         0001-keyboard-Apply-num-lock-to-newly-connected-keyboards.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1081093
+Patch8:         0001-power-Check-that-the-output-is-connected-when-determ.patch
 
 Requires: control-center-filesystem
 Requires: colord
@@ -93,6 +95,7 @@ The %{name}-updates package contains the updates plugin for %{name}
 %patch5 -p1
 %patch6 -p2 -b .translations
 %patch7 -p1
+%patch8 -p1
 
 autoreconf -i -f
 
@@ -269,6 +272,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.xml
 
 %changelog
+* Fri May  2 2014 Rui Matos <rmatos@redhat.com> - 3.8.6.1-9
+- Check that the output is connected when determining if it's ON
+Resolves: #1081093
+
 * Tue Feb 11 2014 Ray Strode <rstrode@redhat.com> 3.8.6.1-8
 - Be more lenient of wonky smartcard hardware/drivers
 Resolves: #1061785