diff --git a/gnome-initial-setup-3.36.1.tar.xz b/gnome-initial-setup-3.36.1.tar.xz
deleted file mode 100644
index 754b611..0000000
--- a/gnome-initial-setup-3.36.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9199fd803dca8c283690bdf31b834e1eb649f701ebdb112b16cc6af4db32d6e9
-size 1143004
diff --git a/gnome-initial-setup-3.36.2.tar.xz b/gnome-initial-setup-3.36.2.tar.xz
new file mode 100644
index 0000000..168864c
--- /dev/null
+++ b/gnome-initial-setup-3.36.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f8be41aea100c56dbf8f0fe1e2354d2d1ac05cf1c79a01cc975c6aa89145756
+size 1144808
diff --git a/gnome-initial-setup.changes b/gnome-initial-setup.changes
index 79bbc49..dd0170b 100644
--- a/gnome-initial-setup.changes
+++ b/gnome-initial-setup.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sun Apr 26 17:23:05 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 3.36.2:
+  + Bugs fixed: keyboard: Nullify pointers if getting layout fails.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Wed Apr 15 06:18:12 UTC 2020 - Cliff Zhao <qzhao@suse.com>
+
+- Update gnome-initial-setup.spec: Drop the is_opensuse macro to
+  eliminate in behavior in between SLE-15 and openSUSE-Leap
+  (jsc#SLE-11857).
+
 -------------------------------------------------------------------
 Sat Mar 28 16:48:16 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec
index 380aa24..2117b19 100644
--- a/gnome-initial-setup.spec
+++ b/gnome-initial-setup.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-initial-setup
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,15 +17,16 @@
 
 
 Name:           gnome-initial-setup
-Version:        3.36.1
+Version:        3.36.2
 Release:        0
 Summary:        GNOME Initial Setup Assistant
 License:        GPL-2.0-or-later
 Group:          System/GUI/GNOME
-Url:            https://wiki.gnome.org/Design/OS/InitialSetup
+URL:            https://wiki.gnome.org/Design/OS/InitialSetup
 Source0:        https://download.gnome.org/sources/gnome-initial-setup/3.36/%{name}-%{version}.tar.xz
 # PATCH-FEATURE-SLE gnome-initial-setup-smarter.patch FATE#325763 FATE#321126 boo#1067288 bnc#1029083 qzhao@suse.com -- Investigate gnome-initial-setup, and make a Smarter gnome initial configuration.
 Patch0:         gnome-initial-setup-smarter.patch
+
 BuildRequires:  krb5-devel
 BuildRequires:  meson
 BuildRequires:  pkgconfig
@@ -69,11 +70,10 @@ Initial assistant, helping you to get the system up and running.
 
 %prep
 %setup -q
-%if !0%{?is_opensuse}
+%if 0%{?sle_version} >= 150200
 %patch0 -p1
 %endif
 
-
 %build
 %meson \
         -Dparental_controls=disabled \
@@ -82,7 +82,7 @@ Initial assistant, helping you to get the system up and running.
 
 %install
 %meson_install
-%if !0%{?is_opensuse}
+%if 0%{?sle_version} >= 150200
 rm -rf %{buildroot}%{_libexecdir}/gnome-welcome-tour
 rm -rf %{buildroot}%{_sysconfdir}/xdg/autostart/gnome-welcome-tour.desktop
 %endif
@@ -119,7 +119,7 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} || :
 %{_userunitdir}/gnome-session.target.wants/gnome-welcome-tour.service
 %dir %{_userunitdir}/gnome-session@gnome-initial-setup.target.wants
 %{_userunitdir}/gnome-session@gnome-initial-setup.target.wants/gnome-initial-setup.service
-%if 0%{?is_opensuse}
+%if 0%{?sle_version} < 150200
 %{_libexecdir}/gnome-welcome-tour
 %{_sysconfdir}/xdg/autostart/gnome-welcome-tour.desktop
 %endif