diff --git a/ooRexx.changes b/ooRexx.changes
index 78da8fc..597f76f 100644
--- a/ooRexx.changes
+++ b/ooRexx.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Oct 15 18:39:48 UTC 2021 - Erico Mendonca <erico.mendonca@suse.com>
+
+- bsc#1191085: re-adding rc* service sbin links with macros.
+
+-------------------------------------------------------------------
+Sat Oct  9 16:14:31 UTC 2021 - Erico Mendonca <erico.mendonca@suse.com>
+
+- bsc#1191085: removing rc* service sbin links for UsrMerge compatibility.
+
 -------------------------------------------------------------------
 Sat Jun  5 20:47:10 UTC 2021 - Erico Mendonca <erico.mendonca@suse.com>
 
diff --git a/ooRexx.spec b/ooRexx.spec
index 729d18b..0aaa9ff 100644
--- a/ooRexx.spec
+++ b/ooRexx.spec
@@ -209,14 +209,12 @@ cd $RPM_BUILD_ROOT/%{_bindir}
 ln -sf %{_datadir}/ooRexx/rexxtry.rex .
 
 # Sort out systemd vs init depending on system version
-mkdir $RPM_BUILD_ROOT/sbin
 %if 0%{?suse_version} > 1230
 mkdir -p %{buildroot}%{_unitdir}
 install -D -m 444 %{buildroot}%{_datadir}/ooRexx/rxapid.service %{buildroot}%{_unitdir}/%{name}.service
 rm -f %{buildroot}%{_datadir}/ooRexx/rxapid.service
-ln -s /sbin/service $RPM_BUILD_ROOT/sbin/rc%{name}
 %else
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init.d
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init.d 
 ln -s %{_bindir}/rxapid $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/rxapid
 ln -s /%{_sysconfdir}/init.d/rxapid $RPM_BUILD_ROOT/sbin/rcrxapid
 rm -f %{buildroot}%{_datadir}/ooRexx/rxapid.service
@@ -238,6 +236,13 @@ done
 touch %{buildroot}%{_sysconfdir}/alternatives/{rexx,rexxc,rxqueue,rexx.1,rexxc.1,rxqueue.1,rxsubcom.1,oorexx-config.1}
 %endif
 
+mkdir -p %{buildroot}%{_sbindir}
+%if 0%{?suse_version} < 1550
+ln -s /sbin/service %{buildroot}%{_sbindir}/rc%{name}
+%else
+ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name}
+%endif
+
 #******************************************************************************
 %clean
 #******************************************************************************
@@ -315,11 +320,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %if 0%{?suse_version} > 1230
 %{_unitdir}/%{name}.service
-/sbin/rcooRexx
 %else
 %{_sysconfdir}/init.d/rxapid
 /sbin/rcrxapid
 %endif
+%{_sbindir}/rc%{name}
 
 #******************************************************************************