diff --git a/html/images/os/arubaos.svg b/html/images/os/aruba.svg
similarity index 100%
rename from html/images/os/arubaos.svg
rename to html/images/os/aruba.svg
diff --git a/includes/definitions/arubaos.yaml b/includes/definitions/arubaos.yaml
index d06958e32d..048a7fdec2 100644
--- a/includes/definitions/arubaos.yaml
+++ b/includes/definitions/arubaos.yaml
@@ -1,7 +1,7 @@
 os: arubaos
 text: ArubaOS
 type: wireless
-icon: arubaos
+icon: aruba
 over:
     - { graph: device_arubacontroller_numaps, text: 'Number of APs' }
     - { graph: device_arubacontroller_numclients, text: 'Number of Clients' }
diff --git a/includes/definitions/clearpass.yaml b/includes/definitions/clearpass.yaml
new file mode 100644
index 0000000000..3edd624fd2
--- /dev/null
+++ b/includes/definitions/clearpass.yaml
@@ -0,0 +1,13 @@
+os: clearpass
+text: 'Aruba Clearpass'
+type: appliance
+icon: aruba
+over:
+    - { graph: device_bits, text: 'Device Traffic' }
+    - { graph: device_storage, text: 'Storage' }
+discovery:
+    -
+        sysObjectId:
+            - .1.3.6.1.4.1.8072.3.2.10
+        sysDescr_regex:
+            - '/^ClearPass Policy Manager/'
\ No newline at end of file
diff --git a/includes/polling/os/clearpass.inc.php b/includes/polling/os/clearpass.inc.php
new file mode 100644
index 0000000000..95f62bebc3
--- /dev/null
+++ b/includes/polling/os/clearpass.inc.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * clearpass.inc.php
+ *
+ * LibreNMS os poller module for Aruba Clearpass
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2017 Neil Lathwood
+ * @author     Neil Lathwood <neil@lathwood.co.uk>
+ */
+
+$hardware_oid   = '.1.3.6.1.4.1.14823.1.6.1.1.1.1.1.1.0';
+$serial_oid     = '.1.3.6.1.4.1.14823.1.6.1.1.1.1.1.2.0';
+$firmware_oid   = '.1.3.6.1.4.1.14823.1.6.1.1.1.1.1.3.0';
+$clearpass_data = snmp_get_multi_oid($device, "$hardware_oid $serial_oid $firmware_oid");
+
+$hardware = trim($clearpass_data[$hardware_oid], '"');
+$serial   = trim($clearpass_data[$serial_oid], '"');
+$version  = trim($clearpass_data[$firmware_oid], '"');
+
+unset(
+    $clearpass_data,
+    $hardware_oid,
+    $firmware_oid
+);
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index f7eea799d1..f5255750c9 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -480,6 +480,11 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('ciscowlc', 'ciscowlc2');
     }
 
+    public function testClearPass()
+    {
+        $this->checkOS('clearpass');
+    }
+
     public function testCmts()
     {
         $this->checkOS('cmts');
diff --git a/tests/snmpsim/clearpass.snmprec b/tests/snmpsim/clearpass.snmprec
new file mode 100644
index 0000000000..2bcf24cbfb
--- /dev/null
+++ b/tests/snmpsim/clearpass.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|ClearPass Policy Manager 6.5.7.85381, Model: CP-HW-5K, FIPS Mode: Disabled, High Capacity Guest Mode: Disabled
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.8072.3.2.10