diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index e09d574..a7dac5f 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -28,14 +28,15 @@
 
 Name:             open-vm-tools
 Version:          %{toolsversion}
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          Open Virtual Machine Tools for virtual machines hosted on VMware
 Group:            Applications/System
 License:          GPLv2
 URL:              https://github.com/vmware/%{name}
 Source0:          https://github.com/vmware/%{name}/releases/download/stable-%{version}/%{name}-%{version}-%{toolsbuild}.tar.gz
-Source1:          %{toolsdaemon}.service
-Source2:          %{vgauthdaemon}.service
+Source1:          %{toolsdaemon}-init.service
+Source2:          %{toolsdaemon}.service
+Source3:          %{vgauthdaemon}.service
 %if 0%{?rhel} >= 7
 ExclusiveArch:    x86_64
 %else
@@ -204,8 +205,9 @@ rm -fr %{buildroot}%{_sbindir} %{buildroot}/sbin/mount.vmhgfs
 mv %{buildroot}%{_sysconfdir}/vmware-tools/vm-support %{buildroot}%{_bindir}
 
 # Systemd unit files
-install -p -m 644 -D %{SOURCE1} %{buildroot}%{_unitdir}/%{toolsdaemon}.service
-install -p -m 644 -D %{SOURCE2} %{buildroot}%{_unitdir}/%{vgauthdaemon}.service
+install -p -m 644 -D %{SOURCE1} %{buildroot}%{_unitdir}/%{toolsdaemon}-init.service
+install -p -m 644 -D %{SOURCE2} %{buildroot}%{_unitdir}/%{toolsdaemon}.service
+install -p -m 644 -D %{SOURCE3} %{buildroot}%{_unitdir}/%{vgauthdaemon}.service
 
 # 'make check' in open-vm-tools rebuilds docs and ends up regenerating
 # the font file. We can add %%check secion once 'make check' is fixed
@@ -224,10 +226,12 @@ if [ -f %{_bindir}/vmware-checkvm -a                     \
    mkdir -p /mnt/hgfs
 fi
 
+%systemd_post %{toolsdaemon}-init.service
 %systemd_post %{vgauthdaemon}.service
 %systemd_post %{toolsdaemon}.service
 
 %preun
+%systemd_preun %{toolsdaemon}-init.service
 %systemd_preun %{toolsdaemon}.service
 %systemd_preun %{vgauthdaemon}.service
 
@@ -253,6 +257,7 @@ if [ "$1" = "0" -a                                       \
 fi
 
 %postun
+%systemd_postun_with_restart %{toolsdaemon}-init.service
 %systemd_postun_with_restart %{toolsdaemon}.service
 %systemd_postun_with_restart %{vgauthdaemon}.service
 
@@ -295,6 +300,7 @@ fi
 %{_libdir}/%{name}/plugins/vmsvc/*.so
 %{_datadir}/%{name}/
 %{_udevrulesdir}/99-vmware-scsi-udev.rules
+%{_unitdir}/%{toolsdaemon}-init.service
 %{_unitdir}/%{toolsdaemon}.service
 %{_unitdir}/%{vgauthdaemon}.service
 
@@ -320,6 +326,9 @@ fi
 %{_bindir}/vmware-vgauth-smoketest
 
 %changelog
+* Fri Aug 10 2018 Ravindra Kumar <ravindrakumar@vmware.com> - 10.3.0-4
+- Fixed few bugs related to vmtoolsd-init.service.
+
 * Tue Aug 07 2018 Ravindra Kumar <ravindrakumar@vmware.com> - 10.3.0-3
 - Implement the https://pagure.io/packaging-committee/issue/506 guideline.
 - Added vmtoolsd-init.service per the guideline.