diff --git a/files/rpm/vmware-tools-EL4.repo b/files/rpm/vmware-tools-EL4.repo
new file mode 100644
index 0000000000000000000000000000000000000000..1b30ab45f6f5da79908dddfa72cd8008d027335f
--- /dev/null
+++ b/files/rpm/vmware-tools-EL4.repo
@@ -0,0 +1,7 @@
+[vmware-tools]
+name=VMware Tools
+baseurl=http://yum.stanford.edu/mrepo/vmware-tools-latest-$basearch/RPMS.rhel4
+gpgkey=http://yum.stanford.edu/VMWARE-PACKAGING-GPG-DSA-KEY.pub
+gpgkey=http://yum.stanford.edu/VMWARE-PACKAGING-GPG-RSA-KEY.pub
+enabled=1
+gpgcheck=1
diff --git a/files/rpm/vmware-tools-EL5.repo b/files/rpm/vmware-tools-EL5.repo
new file mode 100644
index 0000000000000000000000000000000000000000..b0eeb6c0a0b57af843694a74f55e8967f4f820ea
--- /dev/null
+++ b/files/rpm/vmware-tools-EL5.repo
@@ -0,0 +1,7 @@
+[vmware-tools]
+name=VMware Tools
+baseurl=http://yum.stanford.edu/mrepo/vmware-tools-latest-$basearch/RPMS.rhel5
+gpgkey=http://yum.stanford.edu/VMWARE-PACKAGING-GPG-DSA-KEY.pub
+gpgkey=http://yum.stanford.edu/VMWARE-PACKAGING-GPG-RSA-KEY.pub
+enabled=1
+gpgcheck=1
diff --git a/files/rpm/vmware-tools-EL6.repo b/files/rpm/vmware-tools-EL6.repo
new file mode 100644
index 0000000000000000000000000000000000000000..cef197a36116bf024673c3ff4ec7fc34d1372cf3
--- /dev/null
+++ b/files/rpm/vmware-tools-EL6.repo
@@ -0,0 +1,7 @@
+[vmware-tools]
+name=VMware Tools
+baseurl=http://yum.stanford.edu/mrepo/vmware-tools-latest-$basearch/RPMS.rhel6
+gpgkey=http://yum.stanford.edu/VMWARE-PACKAGING-GPG-DSA-KEY.pub
+gpgkey=http://yum.stanford.edu/VMWARE-PACKAGING-GPG-RSA-KEY.pub
+enabled=1
+gpgcheck=1
diff --git a/manifests/vmguest.pp b/manifests/vmguest.pp
index a1fcf1f1c3b9e3da0972df295e5d684ee2857c59..b80874c502257c90740e941f7d2df0764d482995 100644
--- a/manifests/vmguest.pp
+++ b/manifests/vmguest.pp
@@ -29,7 +29,29 @@ class base::vmguest {
       }
     }
     'redhat': {
-      package { 'VMwareTools': ensure => present }
+      base::rpm::yumrepo { "vmware-tools-EL${::lsbmajdistrelease}.repo": }
+      base::rpm::import {
+        'vmware-tools-dsa':
+          url       =>
+            'http://yum.stanford.edu/VMWARE-PACKAGING-GPG-DSA-KEY.pub',
+            signature => 'gpg-pubkey-04bbaa7b-4c881cbf';
+        'vmware-tools-rsa':
+          url       =>
+            'http://yum.stanford.edu/VMWARE-PACKAGING-GPG-RSA-KEY.pub',
+            signature => 'gpg-pubkey-66fd4949-4803fe57';
+      }
+      package {
+        'VMwareTools':
+          ensure  => absent;
+        'vmware-tools-esx-nox':
+          ensure  => present,
+          require => [
+              Base::Rpm::Yumrepo["vmware-tools-EL${::lsbmajdistrelease}.repo"],
+              Base::Rpm::Import['vmware-tools-dsa'],
+              Base::Rpm::Import['vmware-tools-rsa'],
+              Package['VMwareTools']
+            ];
+      }
       service { 'smartd':
         ensure => stopped,
         enable => false,