diff --git a/includes/discovery/mempools/unifi.inc.php b/includes/discovery/mempools/unifi.inc.php
new file mode 100644
index 000000000..26704f422
--- /dev/null
+++ b/includes/discovery/mempools/unifi.inc.php
@@ -0,0 +1,22 @@
+<?php
+/*
+ * LibreNMS Ubiquiti UniFi memory information module
+ *
+ * Copyright (c) 2015 Mike Rostermund <mike@kollegienet.dk>
+ * 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 ($device['os'] == 'unifi') {
+    echo 'UNIFI-MEMORY-POOL: ';
+
+    $total = snmp_get($device, '.1.3.6.1.4.1.10002.1.1.1.1.1.0', '-OvQ');
+    $free  = snmp_get($device, '.1.3.6.1.4.1.10002.1.1.1.1.2.0', '-OvQ');
+
+    if (is_numeric($total) && is_numeric($free)) {
+        discover_mempool($valid_mempool, $device, 0, 'unifi', 'Memory', '1', null, null);
+    }
+}
diff --git a/includes/discovery/processors/unifi.inc.php b/includes/discovery/processors/unifi.inc.php
new file mode 100644
index 000000000..0d463d669
--- /dev/null
+++ b/includes/discovery/processors/unifi.inc.php
@@ -0,0 +1,24 @@
+<?php
+/*
+ * LibreNMS Ubiquiti UniFi CPU information module
+ *
+ * Copyright (c) 2015 Mike Rostermund <mike@kollegienet.dk>
+ * 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 ($device['os'] == 'unifi') {
+    echo 'Ubiquiti UniFi: ';
+
+    $descr = 'CPU';
+    $usage = snmp_get($device, '.1.3.6.1.4.1.10002.1.1.1.4.2.1.3.2', '-Ovqn');
+
+    if (is_numeric($usage)) {
+        discover_processor($valid['processor'], $device, '.1.3.6.1.4.1.10002.1.1.1.4.2.1.3.2', '0', 'unifi', $descr, '1', $usage, null, null);
+    }
+}
+
+unset($processors_array);
diff --git a/includes/polling/mempools/unifi.inc.php b/includes/polling/mempools/unifi.inc.php
new file mode 100644
index 000000000..05611285d
--- /dev/null
+++ b/includes/polling/mempools/unifi.inc.php
@@ -0,0 +1,17 @@
+<?php
+/*
+ * LibreNMS Ubiquiti UniFi memory information module
+ *
+ * Copyright (c) 2015 Mike Rostermund <mike@kollegienet.dk>
+ * 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.
+ */
+
+$total = snmp_get($device, '.1.3.6.1.4.1.10002.1.1.1.1.1.0', '-OvQ');
+$free  = snmp_get($device, '.1.3.6.1.4.1.10002.1.1.1.1.2.0', '-OvQ');
+$mempool['total'] = $total * 1024;
+$mempool['free']  = $free * 1024;
+$mempool['used']  = ($mempool['total'] - $mempool['free']);