diff --git a/gnome-settings-daemon-initial-keyboard.patch b/gnome-settings-daemon-initial-keyboard.patch
index f313500..ad80020 100644
--- a/gnome-settings-daemon-initial-keyboard.patch
+++ b/gnome-settings-daemon-initial-keyboard.patch
@@ -27,14 +27,14 @@ index eb75c92..06be608 100644
          GsdKeyboardManagerPrivate *priv = manager->priv;
          GVariantBuilder builder;
 @@ -501,7 +501,7 @@ get_sources_from_xkb_config (GsdKeyboardManager *manager)
-                 g_free (id);
-         }
  
--        if (!have_default_layout)
-+        if (!have_default_layout && running_under_gdm)
+         init_builder_with_sources (&builder, priv->input_sources_settings);
+ 
+-        if (!layouts) {
++        if (!layouts && running_under_gdm) {
                  g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, DEFAULT_LAYOUT);
- 
-         g_settings_set_value (priv->input_sources_settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
+                 goto out;
+ 	}
 @@ -653,15 +653,23 @@ maybe_create_initial_settings (GsdKeyboardManager *manager)
  
          settings = manager->priv->input_sources_settings;
diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes
index 42a2940..f476405 100644
--- a/gnome-settings-daemon.changes
+++ b/gnome-settings-daemon.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul 31 11:19:54 UTC 2017 - fezhang@suse.com
+
+- Rebase gnome-settings-daemon-initial-keyboard.patch (bsc#1050812)
+
 -------------------------------------------------------------------
 Sat Jul 22 17:03:30 UTC 2017 - zaitor@opensuse.org
 
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 499661e..722ea81 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -45,7 +45,7 @@ Patch1:         gnome-settings-daemon-notify-idle-resumed.patch
 Patch2:         gnome-settings-daemon-bnc873545-hide-warnings.patch
 # PATCH-FIX-SLE gnome-settings-daemon-sle-configure-timeout-blank.patch bnc#869685 bgo#710904 cxiong@suse.com -- monitor off timeout is too short, extends it to 5 min
 Patch3:         gnome-settings-daemon-sle-configure-timeout-blank.patch
-# PATCH-NEEDS-REBASE gnome-settings-daemon-initial-keyboard.patch bsc#979051 boo#1009515 federico@suse.com -- Deal with the default keyboard being set from xkb instead of GNOME -- WAS PATCH-FIX-OPENSUSE
+# PATCH-FIX-OPENSUSE gnome-settings-daemon-initial-keyboard.patch bsc#979051 boo#1009515 federico@suse.com -- Deal with the default keyboard being set from xkb instead of GNOME
 Patch4:         gnome-settings-daemon-initial-keyboard.patch
 # PATCH-FIX-OPENSUSE gnome-settings-daemon-bring-back-updates-plugin.patch bsc#991024 sckang@suse.com -- Add the updates plugin back
 Patch5:         gnome-settings-daemon-bring-back-updates-plugin.patch
@@ -159,8 +159,7 @@ gnome-patch-translation-prepare
 %patch2 -p1
 %patch3 -p0
 %endif
-# Patch needs rebase (boo#1050812)
-#patch4 -p1
+%patch4 -p1
 %if 0%{?suse_version} == 1315
 %patch5 -p1
 %patch6 -p1