diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index f7905afa7..7072655b7 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -22,6 +22,7 @@ $config['ping']           = "/bin/ping";
 $config['mtr']            = "/usr/bin/mtr";
 $config['nmap']           = "/usr/bin/nmap";
 $config['nagios_plugins'] = "/usr/lib/nagios/plugins";
+$config['ipmitool']       = "/usr/bin/ipmitool";
 
 ### RRDCacheD - Make sure it can write to your RRD dir!
 
diff --git a/includes/discovery/ipmi.inc.php b/includes/discovery/ipmi.inc.php
index a96ca5286..73843b9b9 100644
--- a/includes/discovery/ipmi.inc.php
+++ b/includes/discovery/ipmi.inc.php
@@ -10,7 +10,7 @@ if ($ipmi['host'] = get_dev_attrib($device,'ipmi_hostname'))
   $ipmi['user'] = get_dev_attrib($device,'ipmi_username');
   $ipmi['password'] = get_dev_attrib($device,'ipmi_password');
   
-  $results = shell_exec("ipmitool -H " . $ipmi['host'] . " -U " . $ipmi['user'] . " -P " . $ipmi['password'] . " sensor|sort");
+  $results = shell_exec($config['ipmitool'] . " -H " . $ipmi['host'] . " -U " . $ipmi['user'] . " -P " . $ipmi['password'] . " sensor|sort");
 
   foreach (explode("\n",$results) as $sensor)
   {
diff --git a/includes/functions.php b/includes/functions.php
index 36ae3f431..96924a6f6 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -473,6 +473,7 @@ function createHost ($host, $community, $snmpver, $port = 161)
     if (mysql_affected_rows())
     {
       $device_id = mysql_result(mysql_query("SELECT device_id FROM devices WHERE hostname = '$host'"),0);
+      # vv FIXME set_dev_attrib()
       mysql_query("INSERT INTO devices_attribs (attrib_type, attrib_value, device_id) VALUES ('discover','1','$device_id')");
       return("Created host : $host (id:$device_id) (os:$host_os)");
     } 
diff --git a/includes/polling/ipmi.inc.php b/includes/polling/ipmi.inc.php
index e1ec8997c..1afff0e15 100644
--- a/includes/polling/ipmi.inc.php
+++ b/includes/polling/ipmi.inc.php
@@ -9,7 +9,7 @@ if ($ipmi['host'] = get_dev_attrib($device,'ipmi_hostname'))
   $ipmi['password'] = get_dev_attrib($device,'ipmi_password');
       
   echo("Fetching IPMI sensor data...");
-  $results = shell_exec("ipmitool -c -H " . $ipmi['host'] . " -U " . $ipmi['user'] . " -P " . $ipmi['password'] . " sdr");
+  $results = shell_exec($config['ipmitool'] . " -c -H " . $ipmi['host'] . " -U " . $ipmi['user'] . " -P " . $ipmi['password'] . " sdr");
   echo(" done.\n");
 
   foreach (explode("\n",$results) as $row)