diff --git a/includes/discovery/functions.inc.php b/includes/discovery/functions.inc.php
index 180bf8752d..485a33abfe 100644
--- a/includes/discovery/functions.inc.php
+++ b/includes/discovery/functions.inc.php
@@ -305,7 +305,7 @@ function sensor_limit($class, $current)
       $limit = $current * 1.50;
       break;
     case 'fanspeed':
-      $limit = $current * 1.30;
+      $limit = $current * 1.80;
       break;
     case 'power':
       $limit = $current * 1.50;
diff --git a/includes/discovery/vmware-vminfo.inc.php b/includes/discovery/vmware-vminfo.inc.php
index 4daa18fa69..4ce399f551 100755
--- a/includes/discovery/vmware-vminfo.inc.php
+++ b/includes/discovery/vmware-vminfo.inc.php
@@ -28,65 +28,68 @@ if (($device['os'] == "vmware") || ($device['os'] == "linux"))
    *  ...
    */
 
-  $oids = snmp_walk($device, "VMWARE-VMINFO-MIB::vmwVmVMID", "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware");
-  $oids = explode("\n", $oids);
-
-  foreach ($oids as $oid)
+  $oids = snmp_walk($device, "VMWARE-VMINFO-MIB::vmwVmVMID", "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:" . $config["install_dir"] . "/mibs");
+  if ($oids != "")
   {
-    /*
-     * Fetch the Virtual Machine information.
-     *
-     *  VMWARE-VMINFO-MIB::vmwVmDisplayName.224 = STRING: My First VM
-     *  VMWARE-VMINFO-MIB::vmwVmDisplayName.416 = STRING: My Second VM
-     *  VMWARE-VMINFO-MIB::vmwVmGuestOS.224 = STRING: windows7Server64Guest
-     *  VMWARE-VMINFO-MIB::vmwVmGuestOS.416 = STRING: winLonghornGuest
-     *  VMWARE-VMINFO-MIB::vmwVmMemSize.224 = INTEGER: 8192 megabytes
-     *  VMWARE-VMINFO-MIB::vmwVmMemSize.416 = INTEGER: 8192 megabytes
-     *  VMWARE-VMINFO-MIB::vmwVmState.224 = STRING: poweredOn
-     *  VMWARE-VMINFO-MIB::vmwVmState.416 = STRING: poweredOn
-     *  VMWARE-VMINFO-MIB::vmwVmVMID.224 = INTEGER: 224
-     *  VMWARE-VMINFO-MIB::vmwVmVMID.416 = INTEGER: 416
-     *  VMWARE-VMINFO-MIB::vmwVmCpus.224 = INTEGER: 2
-     *  VMWARE-VMINFO-MIB::vmwVmCpus.416 = INTEGER: 2
-     */
-
-    $vmwVmDisplayName = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmDisplayName." . $oid, "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware");
-    $vmwVmGuestOS   = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmGuestOS."   . $oid, "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware");
-    $vmwVmMemSize   = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmMemSize."   . $oid, "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware");
-    $vmwVmState     = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmState."     . $oid, "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware");
-    $vmwVmCpus    = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmCpus."    . $oid, "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware");
-
-    /*
-     * VMware does not return an INTEGER but a STRING of the vmwVmMemSize. This bug
-     * might be resolved by VMware in the future making this code obsolete.
-     */
-
-    if (preg_match("/^([0-9]+) .*$/", $vmwVmMemSize, $matches))
+    $oids = explode("\n", $oids);
+  
+    foreach ($oids as $oid)
     {
-      $vmwVmMemSize = $matches[1];
+      /*
+       * Fetch the Virtual Machine information.
+       *
+       *  VMWARE-VMINFO-MIB::vmwVmDisplayName.224 = STRING: My First VM
+       *  VMWARE-VMINFO-MIB::vmwVmDisplayName.416 = STRING: My Second VM
+       *  VMWARE-VMINFO-MIB::vmwVmGuestOS.224 = STRING: windows7Server64Guest
+       *  VMWARE-VMINFO-MIB::vmwVmGuestOS.416 = STRING: winLonghornGuest
+       *  VMWARE-VMINFO-MIB::vmwVmMemSize.224 = INTEGER: 8192 megabytes
+       *  VMWARE-VMINFO-MIB::vmwVmMemSize.416 = INTEGER: 8192 megabytes
+       *  VMWARE-VMINFO-MIB::vmwVmState.224 = STRING: poweredOn
+       *  VMWARE-VMINFO-MIB::vmwVmState.416 = STRING: poweredOn
+       *  VMWARE-VMINFO-MIB::vmwVmVMID.224 = INTEGER: 224
+       *  VMWARE-VMINFO-MIB::vmwVmVMID.416 = INTEGER: 416
+       *  VMWARE-VMINFO-MIB::vmwVmCpus.224 = INTEGER: 2
+       *  VMWARE-VMINFO-MIB::vmwVmCpus.416 = INTEGER: 2
+       */
+  
+      $vmwVmDisplayName = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmDisplayName." . $oid, "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:" . $config["install_dir"] . "/mibs");
+      $vmwVmGuestOS   = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmGuestOS."   . $oid, "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:" . $config["install_dir"] . "/mibs");
+      $vmwVmMemSize   = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmMemSize."   . $oid, "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:" . $config["install_dir"] . "/mibs");
+      $vmwVmState     = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmState."     . $oid, "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:" . $config["install_dir"] . "/mibs");
+      $vmwVmCpus    = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmCpus."    . $oid, "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:" . $config["install_dir"] . "/mibs");
+  
+      /*
+       * VMware does not return an INTEGER but a STRING of the vmwVmMemSize. This bug
+       * might be resolved by VMware in the future making this code obsolete.
+       */
+  
+      if (preg_match("/^([0-9]+) .*$/", $vmwVmMemSize, $matches))
+      {
+        $vmwVmMemSize = $matches[1];
+      }
+  
+      /*
+       * Check whether the Virtual Machine is already known for this host.
+       */
+  
+      if (mysql_result(mysql_query("SELECT COUNT(id) FROM vminfo WHERE device_id = '" . $device["device_id"] . "' AND vmwVmVMID = '" . $oid . "' AND vm_type='vmware'"), 0) == 0)
+      {
+        mysql_query("INSERT INTO vminfo (device_id, vm_type, vmwVmVMID, vmwVmDisplayName, vmwVmGuestOS, vmwVmMemSize, vmwVmCpus, vmwVmState) VALUES (" . $device["device_id"] . ",'vmware', " . $oid . ", '" . mres($vmwVmDisplayName) . "', '" . mres($vmwVmGuestOS) . "', " . $vmwVmMemSize . ", " . $vmwVmCpus . ", '" . mres($vmwVmState) . "')");
+        echo("+");
+        # FIXME eventlog
+      } else {
+        echo(".");
+      }
+      # FIXME update code!
+  
+      /*
+       * Save the discovered Virtual Machine.
+       */
+  
+      $vmw_vmlist[] = $oid;
     }
-
-    /*
-     * Check whether the Virtual Machine is already known for this host.
-     */
-
-    if (mysql_result(mysql_query("SELECT COUNT(id) FROM vminfo WHERE device_id = '" . $device["device_id"] . "' AND vmwVmVMID = '" . $oid . "' AND vm_type='vmware'"), 0) == 0)
-    {
-      mysql_query("INSERT INTO vminfo (device_id, vm_type, vmwVmVMID, vmwVmDisplayName, vmwVmGuestOS, vmwVmMemSize, vmwVmCpus, vmwVmState) VALUES (" . $device["device_id"] . ",'vmware', " . $oid . ", '" . mres($vmwVmDisplayName) . "', '" . mres($vmwVmGuestOS) . "', " . $vmwVmMemSize . ", " . $vmwVmCpus . ", '" . mres($vmwVmState) . "')");
-      echo("+");
-      # FIXME eventlog
-    } else {
-      echo(".");
-    }
-    # FIXME update code!
-
-    /*
-     * Save the discovered Virtual Machine.
-     */
-
-    $vmw_vmlist[] = $oid;
   }
-
+  
   /*
    * Get a list of all the known Virtual Machines for this host.
    */
@@ -110,8 +113,8 @@ if (($device['os'] == "vmware") || ($device['os'] == "linux"))
   /*
    * Finished discovering VMware information.
    */
-
+  
   echo("\n");
 }
-
+  
 ?>
\ No newline at end of file