diff --git a/packages/sysutils/open-vm-tools/modules-load.d/open-vm-tools.conf b/packages/sysutils/open-vm-tools/modules-load.d/open-vm-tools.conf
deleted file mode 100644
index c0ee39caed..0000000000
--- a/packages/sysutils/open-vm-tools/modules-load.d/open-vm-tools.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# load vmxnet kernel module
-vmxnet
diff --git a/packages/sysutils/open-vm-tools/package.mk b/packages/sysutils/open-vm-tools/package.mk
index ad50475a2e..0d0035a7fd 100644
--- a/packages/sysutils/open-vm-tools/package.mk
+++ b/packages/sysutils/open-vm-tools/package.mk
@@ -33,8 +33,6 @@ PKG_LONGDESC="open-vm-tools: open source implementation of VMware Tools"
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-OPENVMTOOLS_KERNEL_VER=$(basename $(ls -d $ROOT/$BUILD/linux-[0-9]*)| sed 's|linux-||g')
-
 PKG_CONFIGURE_OPTS_TARGET="--disable-docs \
                            --disable-tests \
                            --disable-deploypkg \
@@ -54,18 +52,18 @@ post_unpack() {
 }
 
 pre_configure_target() {
-   export LIBS="-ldnet"
+  export LIBS="-ldnet"
 }
 
-makeinstall_target() {
-  mkdir -p $INSTALL/usr/lib
-    cp -PR libvmtools/.libs/libvmtools.so* $INSTALL/usr/lib
+post_makeinstall_target() {
+  rm -rf $INSTALL/sbin
+  rm -rf $INSTALL/usr/share
+  rm -rf $INSTALL/etc/vmware-tools/scripts/vmware/network
 
-  mkdir -p $INSTALL/usr/bin
-    cp -PR services/vmtoolsd/.libs/vmtoolsd $INSTALL/usr/bin
-    cp -PR checkvm/.libs/vmware-checkvm $INSTALL/usr/bin
+  find $INSTALL/etc/vmware-tools/ -type f | xargs sed -i '/.*expr.*/d'
 }
 
 post_install() {
-  enable_service open-vm-tools.service
+  enable_service vmtoolsd.service
+  enable_service vmware-vmblock-fuse.service
 }
diff --git a/packages/sysutils/open-vm-tools/system.d/open-vm-tools.service b/packages/sysutils/open-vm-tools/system.d/open-vm-tools.service
deleted file mode 100644
index 7117805fe2..0000000000
--- a/packages/sysutils/open-vm-tools/system.d/open-vm-tools.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=OpenVMTools Server
-After=xorg-server.service
-
-ConditionPathExists=/usr/bin/vmware-checkvm
-ConditionPathExists=/usr/bin/vmtoolsd
-
-[Service]
-Type=forking
-PIDFile=/var/run/vmtoolsd.pid
-ExecStart=-/bin/sh -c '/usr/bin/vmware-checkvm && /usr/bin/vmtoolsd --background /var/run/vmtoolsd.pid'
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=graphical.target
diff --git a/packages/sysutils/open-vm-tools/system.d/vmtoolsd.service b/packages/sysutils/open-vm-tools/system.d/vmtoolsd.service
new file mode 100644
index 0000000000..1b9924c1f9
--- /dev/null
+++ b/packages/sysutils/open-vm-tools/system.d/vmtoolsd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Open Virtual Machine Tools (VMware Tools)
+ConditionVirtualization=vmware
+
+[Service]
+ExecStart=/usr/bin/vmtoolsd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/packages/sysutils/open-vm-tools/system.d/vmware-vmblock-fuse.service b/packages/sysutils/open-vm-tools/system.d/vmware-vmblock-fuse.service
new file mode 100644
index 0000000000..9e4d2a3121
--- /dev/null
+++ b/packages/sysutils/open-vm-tools/system.d/vmware-vmblock-fuse.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Open Virtual Machine Tools (vmware-vmblock-fuse)
+ConditionVirtualization=vmware
+
+[Service]
+Type=simple
+RuntimeDirectory=vmblock-fuse
+RuntimeDirectoryMode=755
+ExecStart=/usr/bin/vmware-vmblock-fuse -d -f -o subtype=vmware-vmblock,default_permissions,allow_other /run/vmblock-fuse
+
+[Install]
+WantedBy=multi-user.target