diff --git a/plugins/virtualization/vmware/esx_ b/plugins/virtualization/vmware/esx_
index 19cdb432..003eac27 100755
--- a/plugins/virtualization/vmware/esx_
+++ b/plugins/virtualization/vmware/esx_
@@ -394,6 +394,12 @@ foreach $host_name (@host_names) {
             {   selector => { group => qr/^cpu$/i, name => qr/^usagemhz$/i, instance => qr/^$/ },
                   config => { groupBy => "group", graphName => "host_cpu", graphTitle => "CPU usage per " }
             },
+            {   selector => { group => qr/^cpu$/i, name => qr/^ready$/i, instance => qr/^$/ },
+                  config => { groupBy => "group", graphName => "host_cpu_ready", graphTitle => "Amount of time spent in ready state per " }
+            },
+            {   selector => { group => qr/^cpu$/i, name => qr/^wait$/i, instance => qr/^$/ },
+                  config => { groupBy => "group", graphName => "host_cpu_wait", graphTitle => "Amount of time spent in wait state per " }
+            },
             {   selector => { group => qr/^disk$/i, name => qr/^(read|usage|write)$/i, instance => qr/.+/ },
                   config => { groupBy => "group", graphName => "host_disk_transfer", graphTitle => "Disk Transfer Rates per " }
             },
@@ -433,6 +439,12 @@ foreach $host_name (@host_names) {
                 {   selector => { group => qr/^cpu$/i, name => qr/^usagemhz$/i, vm => qr/^$_$/ },
                       config => { groupBy => "vm", graphName => "$vmName.vm_cpu", graphTitle => "CPU usage for " }
                 },
+                {   selector => { group => qr/^cpu$/i, name => qr/^ready$/i, vm => qr/^$_$/ },
+                      config => { groupBy => "vm", graphName => "$vmName.vm_cpu_ready", graphTitle => "Amount of time spent in ready state per " }
+                },
+                {   selector => { group => qr/^cpu$/i, name => qr/^wait$/i, vm => qr/^$_$/ },
+                      config => { groupBy => "vm", graphName => "$vmName.vm_cpu_wait", graphTitle => "Amount of time spent in wait state per " }
+                },
                 {   selector => { group => qr/^mem$/i, unit => qr/^KB$/i, rollup => qr/^none$/, vm => qr/^$_$/ },
                       config => { groupBy => "vm", graphName => "$vmName.vm_memory", graphTitle => "Memory usage for " }
                 },