diff --git a/.gitignore b/.gitignore
index 37bb939..7e4186b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/open-vm-tools-11.3.5-18557794.tar.gz
+SOURCES/open-vm-tools-12.0.5-19716617.tar.gz
diff --git a/.open-vm-tools.metadata b/.open-vm-tools.metadata
index e208044..1a5a185 100644
--- a/.open-vm-tools.metadata
+++ b/.open-vm-tools.metadata
@@ -1 +1 @@
-f6990193579d96a04bfec6f09e93e0164deef71e SOURCES/open-vm-tools-11.3.5-18557794.tar.gz
+dcdc35708fae2e3e3192fec7e6a93c7b5c0e3c4c SOURCES/open-vm-tools-12.0.5-19716617.tar.gz
diff --git a/SPECS/open-vm-tools.spec b/SPECS/open-vm-tools.spec
index 37fa2d7..57dfade 100644
--- a/SPECS/open-vm-tools.spec
+++ b/SPECS/open-vm-tools.spec
@@ -19,9 +19,9 @@
 ################################################################################
 
 %global _hardened_build 1
-%global majorversion    11.3
+%global majorversion    12.0
 %global minorversion    5
-%global toolsbuild      18557794
+%global toolsbuild      19716617
 %global toolsversion    %{majorversion}.%{minorversion}
 %global toolsdaemon     vmtoolsd
 %global vgauthdaemon    vgauthd
@@ -142,6 +142,15 @@ This package contains only the user-space programs and utility scripts of
 %{name} that are essential for performing service discovery in VMware
 virtual machines by vRealize Operations Service Discovery Management Pack.
 
+%package          salt-minion
+Summary:          Script file to install/uninstall salt-minion
+Group:            System Environment/Libraries
+Requires:         %{name}%{?_isa} = %{version}-%{release}, systemd, curl, coreutils, gawk, grep
+ExclusiveArch:    x86_64
+
+%description      salt-minion
+This package contains a script to setup Salt Minion on VMware virtual machines.
+
 %package          devel
 Summary:          Development libraries for Open Virtual Machine Tools
 Requires:         %{name}%{?_isa} = %{version}-%{release}
@@ -171,6 +180,9 @@ autoreconf -vif
     --enable-xmlsec1 \
     --enable-resolutionkms \
     --enable-servicediscovery \
+%ifarch x86_64
+    --enable-salt-minion \
+%endif
 %if 0%{?fedora} || 0%{?rhel} >= 8
     --with-tirpc \
     --without-gtk2 \
@@ -345,6 +357,7 @@ fi
 %{_libdir}/%{name}/plugins/common/*.so
 %dir %{_libdir}/%{name}/plugins/vmsvc
 %{_libdir}/%{name}/plugins/vmsvc/libappInfo.so
+%{_libdir}/%{name}/plugins/vmsvc/libcomponentMgr.so
 %{_libdir}/%{name}/plugins/vmsvc/libdeployPkgPlugin.so
 %{_libdir}/%{name}/plugins/vmsvc/libgdp.so
 %{_libdir}/%{name}/plugins/vmsvc/libguestInfo.so
@@ -373,6 +386,13 @@ fi
 %{_libdir}/%{name}/plugins/vmsvc/libserviceDiscovery.so
 %{_libdir}/%{name}/serviceDiscovery
 
+%ifarch x86_64
+%files salt-minion
+%dir %{_libdir}/%{name}/componentMgr/
+%dir %{_libdir}/%{name}/componentMgr/saltMinion/
+%{_libdir}/%{name}/componentMgr/saltMinion/svtminion.sh
+%endif
+
 %files devel
 %doc docs/api/build/*
 %exclude %{_includedir}/libDeployPkg/
@@ -389,7 +409,17 @@ fi
 %{_bindir}/vmware-vgauth-smoketest
 
 %changelog
-* Mon Oct 18 2021 Miroslav Rezanian <mrezanin@redhat.com> - 11.3.5-1.el9
+* Tue Jun 07 2022 Miroslav Rezanina <mrezanin@redhat.com> - 12.0.5-1
+- Rebase to open-vm-tools 12.0.5 [bz#2090273]
+- Resolves: bz#2090273
+  ([ESXi][RHEL8]Open-vm-tools release 12.0.5 has been released - please rebase)
+
+* Thu Apr 28 2022 Miroslav Rezanina <mrezanin@redhat.com> - 12.0.0-1
+- Rebase to open-vm-tools 12.0.0 [bz#2061189]
+- Resolves: bz#2061189
+  ([ESXi][RHEL8]Open-vm-tools release 12.0.0 has been released - please rebase)
+
+* Mon Oct 18 2021 Miroslav Rezanian <mrezanin@redhat.com> - 11.3.5-1
 - Rebase to open-vm-tools 11.3.5 [bz#2008244]
 - Resolves: bz#2008244
   ([ESXi][RHEL8]Open-vm-tools release 11.3.5 has been released - please rebase)