diff --git a/discovery.php b/discovery.php
index 5dbd22579b..199ef03bb3 100755
--- a/discovery.php
+++ b/discovery.php
@@ -158,11 +158,6 @@ while ($device = mysql_fetch_array($device_query))
     {
       $device['type'] = $config['os'][$device['os']]['type'];
     }
-    
-    if ($device['os'] == "linux")
-    {
-      if (preg_match("/-server$/", $device['version'])) { $device['type'] = 'server'; }
-    }
   }
 
   $device_end = utime(); $device_run = $device_end - $device_start; $device_time = substr($device_run, 0, 5);
diff --git a/includes/static-config.php b/includes/static-config.php
index fddeef3a8f..5cd277b790 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -16,27 +16,33 @@ $os = "generic";
 $config['os'][$os]['text']      	= "Generic Device";
 
 $os = "linux";
+$config['os'][$os]['type']              = "server";
 $config['os'][$os]['group'] 		= "unix";
 $config['os'][$os]['text']  		= "Linux";
 $config['os'][$os]['ifXmcbc']		= 1;
 
 $os = "freebsd";
+$config['os'][$os]['type']              = "server";
 $config['os'][$os]['group'] 		= "unix";
 $config['os'][$os]['text']  		= "FreeBSD";
 
 $os = "openbsd";
+$config['os'][$os]['type']              = "server";
 $config['os'][$os]['group'] 		= "unix";
 $config['os'][$os]['text']  		= "OpenBSD";
 
 $os = "netbsd";
+$config['os'][$os]['type']              = "server";
 $config['os'][$os]['group'] 		= "unix";
 $config['os'][$os]['text']  		= "NetBSD";
 
 $os = "dragonfly";
+$config['os'][$os]['type']              = "server";
 $config['os'][$os]['group'] 		= "unix";
 $config['os'][$os]['text']  		= "DragonflyBSD";
 
 $os = "netware";
+$config['os'][$os]['type']              = "server";
 $config['os'][$os]['text']  		= "Novell Netware";
 $config['os'][$os]['icon']  		= "novell";
 
@@ -52,6 +58,7 @@ $config['os'][$os]['over'][1]['text']   = "CPU Usage";
 $os = "solaris";
 $config['os'][$os]['group'] 		= "unix";
 $config['os'][$os]['text']  		= "Sun Solaris";
+$config['os'][$os]['type']              = "server";
 
 $os = "adva";
 $config['os'][$os]['type']              = "network";
@@ -60,10 +67,12 @@ $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Device Traffic";
 
 $os = "opensolaris";
+$config['os'][$os]['type']              = "server";
 $config['os'][$os]['group']		= "unix";
 $config['os'][$os]['text']		= "Sun OpenSolaris";
 
 $os = "openindiana";
+$config['os'][$os]['type']              = "server";
 $config['os'][$os]['group']             = "unix";
 $config['os'][$os]['text']              = "OpenIndiana";