diff --git a/cryptsetup.changes b/cryptsetup.changes
index 44f03d3..9e3e0b1 100644
--- a/cryptsetup.changes
+++ b/cryptsetup.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Nov  4 17:33:26 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Fri Sep  4 09:49:31 CEST 2020 - Ludwig Nussel <lnussel@suse.de>
 
diff --git a/cryptsetup.spec b/cryptsetup.spec
index 0068e06..c0522ab 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -144,8 +144,10 @@ for i in cryptsetup integritysetup veritysetup cryptsetup-reencrypt; do
 done
 rm -f %{buildroot}%{_tmpfilesdir}/cryptsetup.conf
 %endif
+%if !0%{?usrmerged}
 install -dm 0755 %{buildroot}/sbin
 ln -s ..%{_sbindir}/cryptsetup%{?is_backports:2} %{buildroot}/sbin
+%endif
 # don't want this file in /lib (FHS compat check), and can't move it to /usr/lib
 find %{buildroot} -type f -name "*.la" -delete -print
 #
@@ -170,7 +172,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 %files
 %doc AUTHORS COPYING* FAQ README TODO docs/ChangeLog.old docs/*ReleaseNotes
+%if !0%{?usrmerged}
 /sbin/cryptsetup%{?is_backports:2}
+%endif
 %{_sbindir}/cryptsetup%{?is_backports:2}
 %{_sbindir}/veritysetup%{?is_backports:2}
 %{_sbindir}/integritysetup%{?is_backports:2}