diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index 296ef1a..aed1df7 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -152,8 +152,8 @@ find %{buildroot}%{_libdir} -name '*.la' -delete
 rm -fr %{buildroot}%{_defaultdocdir}
 rm -f docs/api/build/html/FreeSans.ttf
 
-# Remove mount.vmhgfs
-rm -fr %{buildroot}%{_sbindir}
+# Remove mount.vmhgfs & symlink
+rm -fr %{buildroot}%{_sbindir} %{buildroot}/sbin/mount.vmhgfs
 
 # Move vm-support to /usr/bin
 mv %{buildroot}%{_sysconfdir}/vmware-tools/vm-support %{buildroot}%{_bindir}
@@ -206,9 +206,14 @@ fi
 %license COPYING
 %doc AUTHORS ChangeLog NEWS README
 %config(noreplace) %{_sysconfdir}/pam.d/*
-%{_sysconfdir}/vmware-tools/
+%dir %{_sysconfdir}/vmware-tools/
+%dir %{_sysconfdir}/vmware-tools/vgauth
+%dir %{_sysconfdir}/vmware-tools/vgauth/schemas
 %config(noreplace) %{_sysconfdir}/vmware-tools/*.conf
 %config %{_sysconfdir}/vmware-tools/vgauth/schemas/*
+%{_sysconfdir}/vmware-tools/*-vm-default
+%{_sysconfdir}/vmware-tools/scripts
+%{_sysconfdir}/vmware-tools/statechange.subr
 %{_bindir}/VGAuthService
 %{_bindir}/vm-support
 %{_bindir}/vmtoolsd
@@ -257,6 +262,8 @@ fi
 - Remove initscripts requirement (#1226369).
 - Delete mount.vmhgfs instead of excluding from packaging, so the debug
   information is not included in the package (#1190540).
+- Be more explicit with configuration files, newer mock complains of files being
+  listed twice.
 
 * Tue Jul 07 2015 Ravindra Kumar <ravindrakumar@vmware.com> - 9.10.2-1
 - Package new upstream version open-vm-tools-9.10.2-2822639