diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index fc59516..db0e0dc 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -28,7 +28,7 @@
 
 Name:             open-vm-tools
 Version:          %{toolsversion}
-Release:          5%{?dist}
+Release:          6%{?dist}
 Summary:          Open Virtual Machine Tools for virtual machines hosted on VMware
 License:          GPLv2
 URL:              https://github.com/vmware/%{name}
@@ -264,7 +264,16 @@ fi
 %systemd_post %{vgauthdaemon}.service %{toolsdaemon}.service
 
 %post desktop
-%systemd_post run-vmblock\x2dfuse.mount
+%systemd_post run-vmblock\\x2dfuse.mount
+# Need to enable the service as it is not enabled by default.
+# Enabling an already-enabled service is not an error. So, we
+# can perform this step everytime during the post-install.
+if [ -f %{_bindir}/vmware-checkvm ] &&                   \
+   %{_bindir}/systemd-detect-virt | grep -iq VMware &&   \
+   %{_bindir}/vmware-checkvm &> /dev/null &&             \
+   %{_bindir}/vmware-checkvm -p | grep -q Workstation; then
+   %{_bindir}/systemctl enable run-vmblock\\x2dfuse.mount &> /dev/null || /bin/true
+fi
 
 %post sdmp
 # Load the newly installed or upgraded SDMP plugin
@@ -294,7 +303,7 @@ if [ "$1" = "0" -a                                       \
 fi
 
 %preun desktop
-%systemd_preun run-vmblock\x2dfuse.mount
+%systemd_preun run-vmblock\\x2dfuse.mount
 
 %postun
 %if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
@@ -305,7 +314,7 @@ fi
 %systemd_postun_with_restart %{toolsdaemon}.service %{vgauthdaemon}.service
 
 %postun desktop
-%systemd_postun run-vmblock\x2dfuse.mount
+%systemd_postun run-vmblock\\x2dfuse.mount
 
 %postun sdmp
 # In case of uninstall, unload the uninstalled SDMP plugin
@@ -362,7 +371,6 @@ fi
 %{_udevrulesdir}/99-vmware-scsi-udev.rules
 %{_unitdir}/%{toolsdaemon}.service
 %{_unitdir}/%{vgauthdaemon}.service
-%{_unitdir}/run-vmblock\x2dfuse.mount
 %{_modulesloaddir}/open-vm-tools.conf
 
 %files desktop
@@ -371,6 +379,7 @@ fi
 %attr(4755,-,-) %{_bindir}/vmware-user-suid-wrapper
 %{_bindir}/vmware-vmblock-fuse
 %{_libdir}/%{name}/plugins/vmusr/
+%{_unitdir}/run-vmblock\x2dfuse.mount
 
 %files sdmp
 %{_libdir}/%{name}/plugins/vmsvc/libserviceDiscovery.so
@@ -391,6 +400,11 @@ fi
 %{_bindir}/vmware-vgauth-smoketest
 
 %changelog
+* Mon Apr 05 2021 Ravindra Kumar <ravindrakumar@vmware.com> - 11.2.5-6
+- Added missing escape char in run-vmblock\\x2dfuse.mount service name.
+- Enabled run-vmblock\\x2dfuse.mount service during post-install.
+- Moved run-vmblock\x2dfuse.mount service unit to desktop package.
+
 * Fri Mar 19 2021 Ravindra Kumar <ravindrakumar@vmware.com> - 11.2.5-5
 - Added open-vm-tools-gdk-glib.patch to fix RHBZ#1939718.