diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index efdc18a340..b2fc891122 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1380,6 +1380,14 @@ $config['os'][$os]['icon']             = 'riverbed';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Traffic';
 
+// Ligowave LigoOS
+$os = 'ligoos';
+$config['os'][$os]['text']             = 'LigoWave LigoOS';
+$config['os'][$os]['type']             = 'wireless';
+$config['os'][$os]['icon']             = 'ligowave';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = 'Traffic';
+
 // Appliances
 $os = 'fortios';
 $config['os'][$os]['text']             = 'FortiOS';
diff --git a/includes/discovery/os/ligoos.inc.php b/includes/discovery/os/ligoos.inc.php
new file mode 100644
index 0000000000..08d0a3c2e3
--- /dev/null
+++ b/includes/discovery/os/ligoos.inc.php
@@ -0,0 +1,17 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2015 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 (preg_match('/^LigoPTP/', $sysDescr)) {
+        $os = 'ligoos';
+    }
+}
diff --git a/includes/polling/os/ligoos.inc.php b/includes/polling/os/ligoos.inc.php
new file mode 100644
index 0000000000..66f7b195fb
--- /dev/null
+++ b/includes/polling/os/ligoos.inc.php
@@ -0,0 +1,15 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2015 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.
+ */
+
+list($hardware,$version) = explode(',', $poll_device['sysDescr']);
+preg_match('/(v[0-9\-\.]+)/', $version, $tmp_version);
+$version = rtrim($tmp_version[0],'.');