diff --git a/html/images/os/fujitsu.png b/html/images/os/fujitsu.png
new file mode 100644
index 0000000000..ea780f4db4
Binary files /dev/null and b/html/images/os/fujitsu.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index a296d60f1b..9750bcd9a8 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -2040,6 +2040,17 @@ $config['os'][$os]['text']             = 'Sonus SBC';
 $config['os'][$os]['type']             = 'appliance';
 $config['os'][$os]['icon']             = 'sonus';
 
+// Fujitsu Primergy Switch
+$os = 'fujitsupyos';
+$config['os'][$os]['text']             = 'Fujitsu';
+$config['os'][$os]['type']             = 'network';
+$config['os'][$os]['icon']             = 'fujitsu';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = 'Device Traffic';
+$config['os'][$os]['over'][1]['graph'] = 'device_processor';
+$config['os'][$os]['over'][1]['text']  = 'CPU Usage';
+$config['os'][$os]['over'][2]['graph'] = 'device_mempool';
+$config['os'][$os]['over'][2]['text']  = 'Memory Usage';
 
 // Graph Types
 require_once $config['install_dir'].'/includes/load_db_graph_types.inc.php';
diff --git a/includes/discovery/os/fujitsupyos.inc.php b/includes/discovery/os/fujitsupyos.inc.php
new file mode 100644
index 0000000000..65e30c0f9b
--- /dev/null
+++ b/includes/discovery/os/fujitsupyos.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 (stristr($sysDescr, 'Fujitsu PY CB Eth Switch')) {
+        $os = 'fujitsupyos';
+    }
+}
diff --git a/includes/polling/os/fujitsupyos.inc.php b/includes/polling/os/fujitsupyos.inc.php
new file mode 100644
index 0000000000..91558124aa
--- /dev/null
+++ b/includes/polling/os/fujitsupyos.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.
+ */
+
+$data = str_replace(array('Fujitsu ', ' Runtime Code '), '', explode(',', $poll_device['sysDescr']));
+$hardware = $data[0];
+$version = $data[1];