diff --git a/check-services.php b/check-services.php
index fcbc47df1..d3ce5fa96 100755
--- a/check-services.php
+++ b/check-services.php
@@ -3,8 +3,6 @@
 
 chdir(dirname($argv[0]));
 
-$debug=1;
-
 include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
diff --git a/html/includes/service-add.inc.php b/html/includes/service-add.inc.php
deleted file mode 100644
index bf15839b4..000000000
--- a/html/includes/service-add.inc.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-  $updated = '1';
-
-  $service_id = dbInsert(array('device_id' => $_POST['device'], 'service_ip' => $_POST['ip'], 'service_type' => $_POST['type'], 'service_desc' => $_POST['descr'], 'service_param' => $_POST['params'], 'service_ignore' => '0'), 'services');
-
-  if ($service_id) {
-    $message .= $message_break . "Service added (".$service_id.")!";
-    $message_break .= "<br />";
-  }
-
-?>
diff --git a/html/pages/addsrv.inc.php b/html/pages/addsrv.inc.php
index f6ccaf69d..644f5ff29 100644
--- a/html/pages/addsrv.inc.php
+++ b/html/pages/addsrv.inc.php
@@ -10,7 +10,16 @@ else
   {
     if ($_SESSION['userlevel'] == '10')
     {
-      include("includes/service-add.inc.php");
+      $updated = '1';
+
+      #FIXME should call add_service (needs more parameters)
+      $service_id = dbInsert(array('device_id' => $_POST['device'], 'service_ip' => $_POST['ip'], 'service_type' => $_POST['type'], 'service_desc' => $_POST['descr'], 'service_param' => $_POST['params'], 'service_ignore' => '0'), 'services');
+
+      if ($service_id)
+      {
+        $message .= $message_break . "Service added (".$service_id.")!";
+        $message_break .= "<br />";
+      }
     }
   }
 
diff --git a/includes/common.php b/includes/common.php
index 492cf09a2..acb5895f8 100644
--- a/includes/common.php
+++ b/includes/common.php
@@ -525,4 +525,12 @@ function is_valid_hostname($hostname)
   return ctype_alnum(str_replace('_','',str_replace('-','',str_replace('.','',$hostname))));
 }
 
+function add_service($device, $service, $descr)
+{
+  $insert = array('device_id' => $device['device_id'], 'service_ip' => $device['hostname'], 'service_type' => $service,
+                  'service_changed' => array('UNIX_TIMESTAMP(NOW())'), 'service_desc' => $descr, 'service_param' => "", 'service_ignore' => "0");
+
+  echo dbInsert($insert, 'services');
+}
+
 ?>
diff --git a/includes/discovery/services.inc.php b/includes/discovery/services.inc.php
index 0c1748070..719a765c5 100644
--- a/includes/discovery/services.inc.php
+++ b/includes/discovery/services.inc.php
@@ -24,7 +24,7 @@ if ($config['discover_services'])
           $tcp_port = $split_oid[count($split_oid)-6];
           if ($known_services[$tcp_port])
           {
-            add_service($device,$known_services[$tcp_port]);
+            discover_service($device,$known_services[$tcp_port]);
           }
         }
       }
diff --git a/includes/services.inc.php b/includes/services.inc.php
index daadf028e..eeacaa870 100644
--- a/includes/services.inc.php
+++ b/includes/services.inc.php
@@ -1,16 +1,15 @@
 <?php
 
-## FIXME who wrote this? so ugly :)
-# Not me! -TL
-
-function add_service($device, $service)
+function discover_service($device, $service)
 {
+  if (! dbFetchCell("SELECT COUNT(service_id) FROM `services` WHERE `service_type`= ? AND `device_id` = ?", array($service, $device['device_id'])))
+  {
+    add_service($device, $service, "(Auto discovered) $service");
+    log_event("Autodiscovered service: type " . mres($service), $device, 'service');
+    echo("+");
+  }
+
   echo("$service ");
-
-  $insert = array('device_id' => $device['device_id'], 'service_ip' => $device['hostname'], 'service_type' => $service,
-                  'service_desc' => "auto discovered: $service", 'service_param' => "", 'service_ignore' => "0");
-
-  return dbInsert($insert, 'services');
 }
 
 ?>