diff --git a/vino-3.15.90-avoid-eggsmclient-critical.patch b/vino-3.15.90-avoid-eggsmclient-critical.patch
new file mode 100644
index 0000000..1392b8e
--- /dev/null
+++ b/vino-3.15.90-avoid-eggsmclient-critical.patch
@@ -0,0 +1,26 @@
+From 9fa956adc7af65be0828f68237e716bdc1edfad1 Mon Sep 17 00:00:00 2001
+From: David King <amigadave@amigadave.com>
+Date: Tue, 24 Feb 2015 15:02:41 +0000
+Subject: Avoid a critical EggSMClient warning on startup
+
+https://bugzilla.gnome.org/show_bug.cgi?id=662074
+
+diff --git a/server/vino-main.c b/server/vino-main.c
+index 1f2b2b1..dd95de7 100644
+--- a/server/vino-main.c
++++ b/server/vino-main.c
+@@ -252,6 +252,11 @@ main (int argc, char **argv)
+       { NULL }
+     };
+ 
++    /* Call this before parsing options, as that triggers creation of an SM
++     * client. Creating the client in a disabled state, and then switching to
++     * the real state later, avoids a critical warning on startup. */
++    egg_sm_client_set_mode (EGG_SM_CLIENT_MODE_DISABLED);
++
+     context = g_option_context_new (_("- VNC Server for GNOME"));
+     g_option_context_add_group (context, gtk_get_option_group (TRUE));
+     g_option_context_add_group (context, egg_sm_client_get_option_group ());
+-- 
+cgit v0.10.2
+
diff --git a/vino.spec b/vino.spec
index 7ba4a39..5fa20f6 100644
--- a/vino.spec
+++ b/vino.spec
@@ -1,12 +1,13 @@
 Name:    vino
 Version: 3.15.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A remote desktop system for GNOME
 
 License: GPLv2+
 URL:     https://wiki.gnome.org/Projects/Vino
 #VCS:    git:git://git.gnome.org/vino
 Source0: https://download.gnome.org/sources/%{name}/3.15/%{name}-%{version}.tar.xz
+Patch0:  vino-3.15.90-avoid-eggsmclient-critical.patch
 
 BuildRequires: pkgconfig(avahi-client)
 BuildRequires: pkgconfig(avahi-glib)
@@ -34,6 +35,7 @@ connect to a running GNOME session using VNC.
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -78,6 +80,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 
 
 %changelog
+* Tue Feb 24 2015 David King <amigadave@amigadave.com> - 3.15.90-2
+- Avoid a critical warning from EggSMClient on startup (#1194174)
+
 * Mon Feb 16 2015 David King <amigadave@amigadave.com> - 3.15.90-1
 - Update to 3.15.90
 - Use license macro for COPYING