diff --git a/html/images/os/saf.png b/html/images/os/saf.png
new file mode 100644
index 000000000000..010a780be357
Binary files /dev/null and b/html/images/os/saf.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index d8a4a12f01ee..62b1f87c2362 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -488,6 +488,14 @@
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Traffic';
 
+// Saf Wireless
+$os = 'saf';
+$config['os'][$os]['text']             = 'SAF Wireless';
+$config['os'][$os]['type']             = 'wireless';
+$config['os'][$os]['icon']             = 'saf';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = 'Traffic';
+
 // Supermicro Switch
 $os = 'supermicro-switch';
 $config['os'][$os]['group']  = 'supermicro';
diff --git a/includes/discovery/os/saf.inc.php b/includes/discovery/os/saf.inc.php
new file mode 100644
index 000000000000..fd9ccf068592
--- /dev/null
+++ b/includes/discovery/os/saf.inc.php
@@ -0,0 +1,7 @@
+<?php
+
+if (!$os) {
+    if (strstr($sysObjectId, '.1.3.6.1.4.1.7571.100.1.1.5')) {
+        $os = 'saf';
+    }
+}
diff --git a/includes/polling/os/saf.inc.php b/includes/polling/os/saf.inc.php
new file mode 100644
index 000000000000..7011dcf09031
--- /dev/null
+++ b/includes/polling/os/saf.inc.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2014 Neil Lathwood <https://github.com/laf/ http://www.lathwood.co.uk/fa>
+ *
+ * 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.
+*/
+
+list(,$version,,$hardware,$serial,,) = explode(";", $poll_device['sysDescr']);
+list(,$hardware) = explode(":", $hardware);
+list(,$serial) = explode(":", $serial);
+