diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 012c6ce003..bbadf1b993 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -692,6 +692,17 @@ $config['os'][$os]['over'][1]['text']  = 'CPU Usage';
 $config['os'][$os]['over'][2]['graph'] = 'device_mempool';
 $config['os'][$os]['over'][2]['text']  = 'Memory Usage';
 
+$os = 'cucm';
+$config['os'][$os]['text']             = 'Cisco Unified Communications Manager';
+$config['os'][$os]['type']             = 'tele';
+$config['os'][$os]['icon']             = 'cisco';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = 'Device Traffic';
+$config['os'][$os]['over'][1]['graph'] = 'device_processor';
+$config['os'][$os]['over'][1]['text']  = 'CPU Usage';
+$config['os'][$os]['over'][2]['graph'] = 'device_mempool';
+$config['os'][$os]['over'][2]['text']  = 'Memory Usage';
+
 // Brocade NOS
 $os = 'nos';
 $config['os'][$os]['text']             = 'Brocade NOS';
diff --git a/includes/discovery/os/cucm.inc.php b/includes/discovery/os/cucm.inc.php
new file mode 100644
index 0000000000..ce8ffcf12a
--- /dev/null
+++ b/includes/discovery/os/cucm.inc.php
@@ -0,0 +1,17 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2016 Søren Friis Rosiak <sorenrosiak@gmail.com>
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+
+if (!$os) {
+    if (starts_with($sysObjectId, '.1.3.6.1.4.1.9.1.1348')) {
+        $os = 'cucm';
+    }
+}
diff --git a/includes/discovery/os/linux.inc.php b/includes/discovery/os/linux.inc.php
index 4a1936d148..3b81e06001 100644
--- a/includes/discovery/os/linux.inc.php
+++ b/includes/discovery/os/linux.inc.php
@@ -7,6 +7,7 @@ if (!$os) {
         '.1.3.6.1.4.1.17713.21',
         '.1.3.6.1.4.1.2.3.51.3',
         '.1.3.6.1.4.1.7779.', // nios
+        '.1.3.6.1.4.1.9.1.1348' // Cisco Unified Communications Manager
     );
 
     if (starts_with($sysDescr, 'Linux') && !starts_with($sysObjectId, $skip_oids)) {
diff --git a/includes/polling/os/cucm.inc.php b/includes/polling/os/cucm.inc.php
new file mode 100644
index 0000000000..15f30e008c
--- /dev/null
+++ b/includes/polling/os/cucm.inc.php
@@ -0,0 +1,13 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2016 Søren Friis Rosiak <sorenrosiak@gmail.com>
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+
+$hardware = snmp_get($device, 'sysObjectID.0', '-Osqv', 'SNMPv2-MIB:CISCO-PRODUCTS-MIB');
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index fa7670a93d..0368de8000 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -94,6 +94,11 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('ciscosmblinux', 'Linux Cisco Small Business');
     }
 
+    public function testCucm()
+    {
+        $this->checkOS('cucm', 'Something that we do not have', '.1.3.6.1.4.1.9.1.1348');
+    }
+
     public function testCumulus()
     {
         $this->checkOS('cumulus', 'Linux', '.1.3.6.1.4.1.40310');