diff --git a/rpm.changes b/rpm.changes
index 3354070..1d67bc3 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -70,6 +70,11 @@ Mon Oct 19 11:53:00 CEST 2020 - mls@suse.de
 - Backport FA_TOUCH fixes from upsteam [bnc#1175025] [bnc#1177428]
   * new patch: touch_backport.diff
 
+-------------------------------------------------------------------
+Fri Oct 16 08:42:08 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Fri Oct  9 13:28:33 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 
diff --git a/rpm.spec b/rpm.spec
index a46f303..73ebfee 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -307,7 +307,9 @@ mkdir -p %{buildroot}/usr/share/locale
 ln -s ../share/locale %{buildroot}/usr/lib/locale
 %make_install
 mkdir -p %{buildroot}/bin
+%if !0%{?usrmerged}
 ln -s /usr/bin/rpm %{buildroot}/bin/rpm
+%endif
 %if 0%{?!without_bdb:1}
 install -m 644 db3/db.h %{buildroot}/usr/include/rpm
 %endif
@@ -428,7 +430,9 @@ fi
 %doc 	doc/manual
 %doc    RPM-HOWTO
 	/etc/rpm
+%if !0%{?usrmerged}
 	/bin/rpm
+%endif
 	%{_bindir}/gendiff
 	%{_bindir}/rpm
 	%{_bindir}/rpm2cpio