diff --git a/aaa_base.changes b/aaa_base.changes
index e307954..e45c64b 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 29 09:39:56 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Fri Sep 18 11:30:53 UTC 2020 - dleuenberger@suse.com
 
diff --git a/aaa_base.spec b/aaa_base.spec
index 05bbddf..e537c2f 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -113,6 +113,9 @@ fi
 %install
 #
 make DESTDIR=$RPM_BUILD_ROOT install
+%if 0%{?usrmerged}
+rm -f %{buildroot}/sbin/*
+%endif
 #
 mkdir -p %{buildroot}/etc/sysctl.d
 case "$RPM_ARCH" in
@@ -206,11 +209,8 @@ mkdir -p %{buildroot}%{_fillupdir}
 %ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog
 /etc/hushlogins
 /usr/bin/get_kernel_version
-/sbin/refresh_initrd
 /usr/sbin/refresh_initrd
-/sbin/service
 /usr/sbin/service
-/sbin/smart_agetty
 /usr/sbin/smart_agetty
 /usr/bin/filesize
 /usr/bin/old
@@ -230,6 +230,11 @@ mkdir -p %{buildroot}%{_fillupdir}
 %{_fillupdir}/sysconfig.language
 %{_fillupdir}/sysconfig.proxy
 %{_fillupdir}/sysconfig.windowmanager
+%if !0%{?usrmerged}
+/sbin/service
+/sbin/refresh_initrd
+/sbin/smart_agetty
+%endif
 
 %files extras
 %defattr(-,root,root)