diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 670260459..5e30d2bd7 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1415,6 +1415,14 @@ $config['os'][$os]['icon']             = 'ligowave';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Traffic';
 
+// HWGroup Poseidon
+$os = 'poseidon';
+$config['os'][$os]['text']             = 'Poseidon';
+$config['os'][$os]['type']             = 'environment';
+$config['os'][$os]['icon']             = 'generic';
+$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/poseidon.inc.php b/includes/discovery/os/poseidon.inc.php
new file mode 100644
index 000000000..080a3be95
--- /dev/null
+++ b/includes/discovery/os/poseidon.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 (strstr($sysObjectId, '.1.3.6.1.4.1.21796.3.3')) {
+        $os = 'poseidon';
+    }
+}
\ No newline at end of file
diff --git a/includes/polling/os/poseidon.inc.php b/includes/polling/os/poseidon.inc.php
new file mode 100644
index 000000000..b5732e153
--- /dev/null
+++ b/includes/polling/os/poseidon.inc.php
@@ -0,0 +1,15 @@
+<?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.
+ */
+
+preg_match_all('/Poseidon [0-9]+|[0-9]+.[0-9]+.[0-9]/', $poll_device['sysDescr'], $matches);
+$hardware = $matches[0][0];
+$version = $matches[0][1];
\ No newline at end of file