diff --git a/discovery.php b/discovery.php
index cb232aaaa..b4558f50a 100755
--- a/discovery.php
+++ b/discovery.php
@@ -161,6 +161,11 @@ while ($device = mysql_fetch_array($device_query))
       case "netmanplus":
         $device['type'] = 'power'; 
         break;
+      case "akcp":
+      case "minkelsrms":
+      case "papouch-tme":
+        $device['type'] = 'environment';
+        break;
     }
   }
 
diff --git a/html/images/icons/environment.png b/html/images/icons/environment.png
new file mode 100755
index 000000000..cb3d54d06
Binary files /dev/null and b/html/images/icons/environment.png differ
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 1c0b3d7cf..077458df4 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -58,6 +58,7 @@ if (isset($config['enable_printers']) && $config['enable_printers'])
 }
 ?>
         <li><a href="devices/power/"><img src="images/icons/power.png" border="0" align="absmiddle" /> Power</a></li>
+        <li><a href="devices/environment/"><img src="images/icons/environment.png" border="0" align="absmiddle" /> Environment</a></li>
         <li><hr width="140" /></li>
         <li><a href="devices/alerted/"><img src="images/16/server_error.png" border="0" align="absmiddle" /> Alerts (<?php echo $device_alerts ?>)</a></li>
 <?php
diff --git a/html/pages/device/edit/device.inc.php b/html/pages/device/edit/device.inc.php
index a0269b9a7..5d81d40c5 100644
--- a/html/pages/device/edit/device.inc.php
+++ b/html/pages/device/edit/device.inc.php
@@ -15,8 +15,6 @@ if($updated && $update_message) {
   print_error($update_message);
 }
 
-$device_types = array('server','network','firewall','workstation','printer','power');
-
 echo("<table cellpadding=0 cellspacing=0><tr><td>
 
 <h5>
diff --git a/includes/static-config.php b/includes/static-config.php
index 67f1f3057..e0be161a1 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -95,6 +95,7 @@ if(!$config['graph_colours']['mixed']) {
   $config['graph_colours']['mixed']  = array("CC0000", "008C00", "4096EE", "73880A", "D01F3C", "36393D", "FF0084");
 }
 
+$device_types = array('server','network','firewall','workstation','printer','power', 'environment');
 
 ##############################
 # No changes below this line #
diff --git a/poller.php b/poller.php
index 78237089e..bed7120ee 100755
--- a/poller.php
+++ b/poller.php
@@ -259,7 +259,7 @@ $poller_end = utime(); $poller_run = $poller_end - $poller_start; $poller_time =
 
 $string = $argv[0] . " $doing " .  date("F j, Y, G:i") . " - $polled_devices devices polled in $poller_time secs";
 if ($debug) echo("$string\n");
-shell_exec("echo '".$string."' >> ".$config['install_dir']."/observer.log");
+shell_exec("echo '".$string."' >> ".$config['install_dir']."/observer.log"); # FIXME EWW
 
 
 ?>