diff --git a/includes/discovery/os/sentry3.inc.php b/includes/discovery/os/sentry3.inc.php
new file mode 100644
index 000000000..a96a68daa
--- /dev/null
+++ b/includes/discovery/os/sentry3.inc.php
@@ -0,0 +1,8 @@
+<?php
+
+if (!$os)
+{
+  if (preg_match("/^Sentry\ Switched /", $sysDescr)) { $os = "sentry3"; }
+}
+
+?>
diff --git a/includes/polling/os/sentry3.inc.php b/includes/polling/os/sentry3.inc.php
new file mode 100644
index 000000000..a177761db
--- /dev/null
+++ b/includes/polling/os/sentry3.inc.php
@@ -0,0 +1,13 @@
+<?php
+
+#Sentry3-MIB::towerModelNumber	"CW-24V2-L30M"	
+#Sentry3-MIB::systemVersion	"Sentry Switched CDU Version 6.0g"
+#Sentry3-MIB::towerProductSN	"ABEF0001561"
+
+$hardware = snmp_get($device, "towerModelNumber.1", "-Ovq", "Sentry3-MIB");
+$serial = snmp_get($device, "towerProductSN.1", "-Ovq", "Sentry3-MIB");
+$version = snmp_get($device, "systemVersion.0", "-Ovq", "Sentry3-MIB");
+$version = preg_split('/Sentry\ Switched\ CDU\ Version/', $version);
+$version = $version[1];
+
+?>
\ No newline at end of file
diff --git a/includes/static-config.php b/includes/static-config.php
index a2f32d786..225ce1c50 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -604,6 +604,13 @@ $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Traffic";
 $config['os'][$os]['type']              = "network";
 
+$os = "sentry3";
+$config['os'][$os]['text']            	= "ServerTech Sentry3";
+$config['os'][$os]['type']		= "power";
+$config['os'][$os]['over'][0]['graph']  = "device_current";
+$config['os'][$os]['over'][0]['text']   = "Current";
+$config['os'][$os]['icon']  		= "servertech";
+
 $device_types = array('server', 'network', 'firewall', 'workstation', 'printer', 'power', 'environment');
 
 ### Graph Types