diff --git a/vmware/manifests/guest.pp b/vmware/manifests/guest.pp
index 127eaeb..98b1527 100644
--- a/vmware/manifests/guest.pp
+++ b/vmware/manifests/guest.pp
@@ -1,10 +1,13 @@
 
+# Install VMware optimizations if running as guest.
+#
 class vmware::guest {
 
     case $virtual {
 	vmware: {
-	    case $kernel {
-		Linux: { include vmware::guest::linux }
+	    case $operatingsystem {
+		centos: { include vmware::guest::centos }
+		fedora: { include vmware::guest::fedora }
 	    }
 	}
     }
@@ -12,7 +15,9 @@ class vmware::guest {
 }
 
 
-class vmware::guest::linux {
+# Handler for CentOS.
+#
+class vmware::guest::centos {
 
     package { "VMwareTools":
 	ensure => installed,
@@ -32,3 +37,21 @@ class vmware::guest::linux {
     }
 
 }
+
+
+# Handler for Fedora.
+#
+# VMware tools do not keep up with Fedora kernels so use
+# open-vm-tools instead.
+#
+class vmware::guest::fedora {
+
+    package { "VMwareTools":
+	ensure => absent,
+    }
+    package { "open-vm-tools":
+	ensure  => installed,
+	require => Package["VMwareTools"],
+    }
+
+}