diff --git a/open-vm-tools.changes b/open-vm-tools.changes
index 2edac1f..5ea0bfe 100644
--- a/open-vm-tools.changes
+++ b/open-vm-tools.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 15 13:14:28 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Thu Jan 21 23:11:19 UTC 2021 - Kirk Allan <kallan@suse.com>
 
diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index 388c0bb..769bac7 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -311,7 +311,10 @@ install -D -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/modprobe.d/50-vmnics.co
 %endif
 
 # fix a link pointing to the buildroot for mount.vmhgfs
-( cd %{buildroot}/sbin; rm mount.vmhgfs; ln -s ..%{_sbindir}/mount.vmhgfs )
+rm %{buildroot}/sbin/mount.vmhgfs
+%if !0%{?usrmerged}
+ln -s ..%{_sbindir}/mount.vmhgfs %{buildroot}/sbin/mount.vmhgfs
+%endif
 
 %pre
 %service_add_pre vmtoolsd.service
@@ -416,7 +419,9 @@ rm -rf %{buildroot}
 %{_bindir}/vmware-xferlogs
 %{_bindir}/vm-support
 %{_sbindir}/mount.vmhgfs
+%if !0%{?usrmerged}
 /sbin/mount.vmhgfs
+%endif
 %config(noreplace) %{_sysconfdir}/pam.d/vmtoolsd
 %dir %{_sysconfdir}/vmware-tools
 %dir %{_sysconfdir}/vmware-tools/scripts