diff --git a/html/images/os/multimatic.png b/html/images/os/multimatic.png
new file mode 100644
index 000000000..5080c4dcb
Binary files /dev/null and b/html/images/os/multimatic.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index be7438e40..5097006de 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1190,6 +1190,12 @@ $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Device Traffic";
 $config['os'][$os]['icon']              = "enterasys";
 
+// Multimatic UPS (Generex CS121 SNMP Adapter)
+$os = "multimatic";
+$config['os'][$os]['text']              = "Multimatic UPS";
+$config['os'][$os]['type']              = "power";
+$config['os'][$os]['icon']              = "multimatic";
+
 foreach ($config['os'] as $this_os => $blah)
 {
   if (isset($config['os'][$this_os]['group']))
diff --git a/includes/discovery/os/multimatic.inc.php b/includes/discovery/os/multimatic.inc.php
new file mode 100644
index 000000000..f97c488cf
--- /dev/null
+++ b/includes/discovery/os/multimatic.inc.php
@@ -0,0 +1,9 @@
+<?php
+
+if (!$os) {
+    if (preg_match("/^CS121/", $sysDescr)) {
+	    if (strstr(snmp_get($device, "UPS-MIB::upsIdentManufacturer.0", "-Oqv", ""), "Multimatic")){ 
+		    $os = "multimatic";
+	    }
+    }
+}
diff --git a/includes/polling/os/multimatic.inc.php b/includes/polling/os/multimatic.inc.php
new file mode 100644
index 000000000..d7d1366c6
--- /dev/null
+++ b/includes/polling/os/multimatic.inc.php
@@ -0,0 +1,5 @@
+<?php
+
+
+$hardware = snmp_get($device, "upsIdentModel.0", "-OQv", "UPS-MIB");
+$version = snmp_get($device, "upsIdentAgentSoftwareVersion.0", "-OQv", "UPS-MIB");