diff --git a/packages/sysutils/open-vm-tools/init.d/92_open-vm-tools b/packages/sysutils/open-vm-tools/init.d/92_open-vm-tools
index fa1690e70e..3ebce7d72c 100644
--- a/packages/sysutils/open-vm-tools/init.d/92_open-vm-tools
+++ b/packages/sysutils/open-vm-tools/init.d/92_open-vm-tools
@@ -31,7 +31,6 @@
   wait_for_xorg
 
   # load modules
-  modprobe vmhgfs
   modprobe vmxnet
 
   /usr/bin/vmtoolsd --background /var/run/vmtoolsd.pid
diff --git a/packages/sysutils/open-vm-tools/install b/packages/sysutils/open-vm-tools/install
index e3b9ddd57b..2f273b4a10 100755
--- a/packages/sysutils/open-vm-tools/install
+++ b/packages/sysutils/open-vm-tools/install
@@ -27,28 +27,9 @@ VER=`ls $BUILD/linux*/modules/lib/modules`
 mkdir -p $INSTALL/lib/modules/$VER/open-vm-tools
  find $PKG_BUILD/ -name \*.ko -exec cp {} $INSTALL/lib/modules/$VER/open-vm-tools \;
 
-mkdir -p $INSTALL/sbin
- cp -PR $PKG_BUILD/hgfsmounter/mount.vmhgfs $INSTALL/sbin
-
 mkdir -p $INSTALL/usr/lib
- cp -PR $PKG_BUILD/libguestlib/.libs/libguestlib.so* $INSTALL/usr/lib
- cp -PR $PKG_BUILD/libhgfs/.libs/libhgfs.so* $INSTALL/usr/lib
  cp -PR $PKG_BUILD/libvmtools/.libs/libvmtools.so* $INSTALL/usr/lib
 
-mkdir -p $INSTALL/usr/lib/open-vm-tools/plugins/common
- cp -PR $PKG_BUILD/services/plugins/*/.libs/libhgfsServer.so $INSTALL/usr/lib/open-vm-tools/plugins/common
- cp -PR $PKG_BUILD/services/plugins/*/.libs/libvix.so $INSTALL/usr/lib/open-vm-tools/plugins/common
-
-mkdir -p $INSTALL/usr/lib/open-vm-tools/plugins/vmsvc
- cp -PR $PKG_BUILD/services/plugins/*/.libs/libguestInfo.so $INSTALL/usr/lib/open-vm-tools/plugins/vmsvc
- cp -PR $PKG_BUILD/services/plugins/*/.libs/libpowerOps.so $INSTALL/usr/lib/open-vm-tools/plugins/vmsvc
- cp -PR $PKG_BUILD/services/plugins/*/.libs/libtimeSync.so $INSTALL/usr/lib/open-vm-tools/plugins/vmsvc
- cp -PR $PKG_BUILD/services/plugins/*/.libs/libvmbackup.so $INSTALL/usr/lib/open-vm-tools/plugins/vmsvc
-
 mkdir -p $INSTALL/usr/bin
  cp -PR $PKG_BUILD/services/vmtoolsd/.libs/vmtoolsd $INSTALL/usr/bin
  cp -PR $PKG_BUILD/checkvm/.libs/vmware-checkvm $INSTALL/usr/bin
- cp -PR $PKG_BUILD/hgfsclient/.libs/vmware-hgfsclient $INSTALL/usr/bin
- cp -PR $PKG_BUILD/rpctool/vmware-rpctool $INSTALL/usr/bin
- cp -PR $PKG_BUILD/toolbox/.libs/vmware-toolbox-cmd $INSTALL/usr/bin
- cp -PR $PKG_BUILD/xferlogs/.libs/vmware-xferlogs $INSTALL/usr/bin
diff --git a/packages/sysutils/open-vm-tools/patches/open-vm-tools-disable-vmhgfs.patch b/packages/sysutils/open-vm-tools/patches/open-vm-tools-disable-vmhgfs.patch
new file mode 100644
index 0000000000..d157944217
--- /dev/null
+++ b/packages/sysutils/open-vm-tools/patches/open-vm-tools-disable-vmhgfs.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index b79026d..ac73873 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -947,7 +947,7 @@ if test "$os" = "linux"; then
+ 
+    LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lrt"
+ 
+-   MODULES="$MODULES vmxnet vmhgfs"
++   MODULES="$MODULES vmxnet"
+    # See if we need vmci and vsock modules. Starting with 3.9 they made
+    # their way into mainline kernel.
+    if test "$osVersion" -lt 309000; then