diff --git a/includes/services.inc.php b/includes/services.inc.php
index ce72285f21..6cc5467393 100644
--- a/includes/services.inc.php
+++ b/includes/services.inc.php
@@ -1,21 +1,17 @@
 <?php
 
-  ## FIXME who wrote this? so ugly :)
+## FIXME who wrote this? so ugly :)
+# Not me! -TL
 
-  function add_service($service) {
-    global $id;
-    global $hostname;
-    echo("$service ");
+function add_service($device, $service)
+{
+  echo("$service ");
 
-    #$sql = "INSERT INTO `services` (`device_id`,`service_ip`,`service_type`,`service_desc`,`service_param`,`service_ignore`)
-    #                      VALUES ('" . mres($id). "','" . mres($hostname) . "','" . mres($service) . "',
-    #                              '" . mres("auto discovered: $service") . "','" . mres("") . "','0')";
+  $insert = array('device_id' => $device['device_id'], 'service_ip' => $device['hostname'], 'service_type' => $service, 
+                  'service_desc' => "auto discovered: $service", 'service_param' => "", 'service_ignore' => "0");
 
-    $insert = array('device_id' => $id, 'service_ip' => $hostname, 'service_type' => $service, 'service_desc' => "auto discovered: $service", 'service_param' => "", 'service_ignore' => "0");
-
-    return dbInsert($insert, 'services');    
-
-  }
+  return dbInsert($insert, 'services');    
+}
 
 
 ?>