diff --git a/includes/discovery/os/poweralert.inc.php b/includes/discovery/os/poweralert.inc.php
new file mode 100644
index 000000000..a2fbff009
--- /dev/null
+++ b/includes/discovery/os/poweralert.inc.php
@@ -0,0 +1,8 @@
+<?php
+
+if (!$os)
+{
+  if (preg_match("/^POWERALERT/", $sysDescr)) { $os = "poweralert"; }
+}
+
+?>
diff --git a/includes/polling/os/poweralert.inc.php b/includes/polling/os/poweralert.inc.php
new file mode 100644
index 000000000..8b5ad0a8e
--- /dev/null
+++ b/includes/polling/os/poweralert.inc.php
@@ -0,0 +1,17 @@
+<?php
+
+#.1.3.6.1.2.1.33.1.1.2.0 = STRING: "TRIPP LITE PDUMH20HVATNET"
+#.1.3.6.1.2.1.33.1.1.4.0 = STRING: "12.04.0052"
+#.1.3.6.1.2.1.33.1.1.5.0 = STRING: "sysname.company.com"
+#.1.3.6.1.4.1.850.100.1.1.4.0 = STRING: "9942AY0AC796000912"
+#.1.3.6.1.4.1.850.10.2.2.1.12.1 = STRING: "This Is My Location"
+
+$hardware    = snmp_get($device, "upsIdentModel.0", "-Ovq", "UPS-MIB");
+$hardware    = preg_split('/TRIPP\ LITE/', $hardware);
+$hardware    = $hardware[1];
+$sysLocation = trim(snmp_get($device, ".1.3.6.1.4.1.850.10.2.2.1.12.1", "-Ovq", "TRIPPLITE-MIB"), "\"");
+$sysName     = trim(snmp_get($device, ".1.3.6.1.2.1.33.1.1.5.0", "-Ovq", "TRIPPLITE-MIB"), "\"");
+$serial      = trim(snmp_get($device, ".1.3.6.1.4.1.850.100.1.1.4.0", "-Ovq", "TRIPPLITE-MIB"), "\"");
+$version     = snmp_get($device, "upsIdentAgentSoftwareVersion.0", "-Ovq", "UPS-MIB");
+
+?>