diff --git a/plymouth.changes b/plymouth.changes
index 44ded5a..c07d06b 100644
--- a/plymouth.changes
+++ b/plymouth.changes
@@ -6,6 +6,11 @@ Thu Oct 27 06:38:44 UTC 2020 - Cliff Zhao <qzhao@suse.com>
   the test, and yast-installation prgram has a feature to install 
   system through it (bnc#1051692 bnc#1164123 bnc#1170906). 
 
+-------------------------------------------------------------------
+Fri Oct 16 10:16:39 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Wed Oct  7 14:53:06 UTC 2020 - Cliff Zhao <qzhao@suse.com>
 
diff --git a/plymouth.spec b/plymouth.spec
index 351250c..3423121 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -389,9 +389,11 @@ make %{?_smp_mflags}
 %make_install
 rm -f %{buildroot}/%{_bindir}/rhgb-client
 
+%if !0%{?usrmerged}
 #Link the plymouth client binary also to /bin until the move to /usr is completed
 mkdir %{buildroot}/bin
 (cd %{buildroot}/bin; ln -s ..%{_bindir}/plymouth)
+%endif
 
 # Glow isn't quite ready for primetime
 rm -rf %{buildroot}%{_datadir}/plymouth/glow/
@@ -417,14 +419,14 @@ rm -f  %{buildroot}%{_datadir}/plymouth/plymouthd.conf
 if [ ! -e /.buildenv ]; then
    [ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration
 fi
-[ -x /bin/systemctl ] && /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%service_add_post
 
 %postun
 %{?regenerate_initrd_post}
+%service_del_postun
 if [ $1 -eq 0 ]; then
     rm -f %{_libdir}/plymouth/default.so
     rm -f /boot/initrd-plymouth.img
-    [ -x /bin/systemctl ] && /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 fi
 
 %posttrans
@@ -519,7 +521,9 @@ fi
 /etc/logrotate.d/bootlog
 %{plymouthdaemon_execdir}/plymouthd
 %{plymouthclient_execdir}/plymouth
+%if !0%{?usrmerged}
 /bin/plymouth
+%endif
 %{_libdir}/plymouth/details.so
 %{_libdir}/plymouth/text.so
 %{_libdir}/plymouth/renderers/drm*