diff --git a/0001-Avoid-SEGV-in-gs_fade_reset.patch b/0001-Avoid-SEGV-in-gs_fade_reset.patch
new file mode 100644
index 0000000..52bff28
--- /dev/null
+++ b/0001-Avoid-SEGV-in-gs_fade_reset.patch
@@ -0,0 +1,35 @@
+From dc516c4e99c45ee4433062f473665e59a06de546 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Thu, 16 Jul 2015 22:21:18 -0500
+Subject: [PATCH] Avoid SEGV in gs_fade_reset
+
+On Fedora 21, when run in tigervnc-server built with xorg-x11-server-1.16,
+but not on Xorg nor on Fedora 22 with tigervnc-server built with 1.17,
+it appears that nothing provides the necessary functionality for a fade,
+but (*fade_finish) is called without checking.
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/gs-fade.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/gs-fade.c b/src/gs-fade.c
+index 68e596f..03e02cf 100644
+--- a/src/gs-fade.c
++++ b/src/gs-fade.c
+@@ -835,8 +835,10 @@ gs_fade_reset (GSFade *fade)
+ 
+         gs_fade_set_alpha (fade, fade->priv->current_alpha);
+ 
+-        for (i = 0; i < fade->priv->num_screens; i++)
+-                fade->priv->screen_priv[i].fade_finish (fade, i);
++        for (i = 0; i < fade->priv->num_screens; i++) {
++                if (fade->priv->screen_priv[i].fade_type != FADE_TYPE_NONE)
++                        fade->priv->screen_priv[i].fade_finish (fade, i);
++        }
+ }
+ 
+ static void
+-- 
+2.1.0
+
diff --git a/gnome-screensaver.spec b/gnome-screensaver.spec
index 783b3f7..0a39325 100644
--- a/gnome-screensaver.spec
+++ b/gnome-screensaver.spec
@@ -8,7 +8,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 3.6.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 #VCS: git:git://git.gnome.org/gnome-screensaver
@@ -18,6 +18,8 @@ Source1: gnome-screensaver-hide-xscreensaver.menu
 Patch8: gnome-screensaver-2.20.0-selinux-permit.patch
 Patch9: gnome-screensaver-autostart.patch
 
+Patch101: 0001-Avoid-SEGV-in-gs_fade_reset.patch
+
 URL: http://www.gnome.org
 BuildRequires: gtk3-devel => %{gtk3_version}
 BuildRequires: dbus-devel >= %{dbus_version}
@@ -56,6 +58,7 @@ simple, sane, secure defaults and be well integrated with the desktop.
 %setup -q
 %patch8 -p1 -b .selinux-permit
 %patch9 -p1 -b .autostart
+%patch101 -p1 -b .gs_fade_reset
 
 autoreconf -f -i
 
@@ -77,6 +80,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Fri Jul 17 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.6.1-11
+- Fix SIGSEGV in gs_fade_reset (#1244084)
+
 * Tue Jul 14 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.6.1-10
 - Update autostart file for GNOME Flashback.