diff --git a/gnome-initial-setup.changes b/gnome-initial-setup.changes
index f2b11f7..2f9a382 100644
--- a/gnome-initial-setup.changes
+++ b/gnome-initial-setup.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun 15 09:10:31 UTC 2020 - Yifan Jiang <yfjiang@suse.com>
+
+- Update gnome-initial-setup.spec: Start gnome-initial-setup via
+  xdg autostart as an alternative to systemd user units on
+  SLE-15-SP2 and Leap 15.2 (bsc#1172910).
+
 -------------------------------------------------------------------
 Thu Jun  4 10:33:50 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec
index c8e4b98..d9775c9 100644
--- a/gnome-initial-setup.spec
+++ b/gnome-initial-setup.spec
@@ -77,6 +77,9 @@ Initial assistant, helping you to get the system up and running.
 %build
 %meson \
         -Dparental_controls=disabled \
+%if 0%{?sle_version} && 0%{?sle_version} < 160000
+        -Dsystemd=false \
+%endif
 	%{nil}
 %meson_build
 
@@ -109,6 +112,7 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} || :
 %{_libexecdir}/gnome-initial-setup-copy-worker
 %{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop
 %{_sysconfdir}/xdg/autostart/gnome-initial-setup-first-login.desktop
+%if !0%{?sle_version} || 0%{?sle_version} >= 160000
 %{_userunitdir}/gnome-initial-setup-copy-worker.service
 %{_userunitdir}/gnome-initial-setup-first-login.service
 %{_userunitdir}/gnome-initial-setup.service
@@ -119,6 +123,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
+%endif
 %if 0%{?sle_version} < 150200
 %{_libexecdir}/gnome-welcome-tour
 %{_sysconfdir}/xdg/autostart/gnome-welcome-tour.desktop