diff --git a/grep.changes b/grep.changes
index f6974c6..a19b9a2 100644
--- a/grep.changes
+++ b/grep.changes
@@ -11,6 +11,11 @@ Mon Nov  9 15:47:58 UTC 2020 - Andreas Schwab <schwab@suse.de>
     failure.
 - werror-return-type.patch: work around gcc bug
 
+-------------------------------------------------------------------
+Fri Oct 30 10:12:18 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Mon Sep 28 08:54:47 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
 
diff --git a/grep.spec b/grep.spec
index 4fd7cf3..dcd3d8a 100644
--- a/grep.spec
+++ b/grep.spec
@@ -64,12 +64,12 @@ make %{?_smp_mflags} check
 
 %install
 %make_install
-#UsrMerge
+%if !0%{?usrmerged}
 install -d %{buildroot}/bin
 ln -sf %{_bindir}/egrep %{buildroot}/bin/egrep
 ln -sf %{_bindir}/fgrep %{buildroot}/bin/fgrep
 ln -sf %{_bindir}/grep %{buildroot}/bin/grep
-#EndUsrMerge
+%endif
 %fdupes -s %{buildroot}
 %find_lang %{name}
 
@@ -83,11 +83,11 @@ ln -sf %{_bindir}/grep %{buildroot}/bin/grep
 %defattr(-,root,root)
 %license COPYING
 %doc README AUTHORS NEWS THANKS TODO ChangeLog*
-#UsrMerge
+%if !0%{?usrmerged}
 /bin/egrep
 /bin/fgrep
 /bin/grep
-#EndUsrMerge
+%endif
 %{_bindir}/egrep
 %{_bindir}/fgrep
 %{_bindir}/grep