diff --git a/includes/discovery/os/fortios.inc.php b/includes/discovery/os/fortios.inc.php
new file mode 100644
index 000000000..bf432ddd7
--- /dev/null
+++ b/includes/discovery/os/fortios.inc.php
@@ -0,0 +1,7 @@
+<?php
+
+if (!$os) {
+    if (strstr($sysObjectId, '.1.3.6.1.4.1.12356.103.3.20')) {
+        $os = 'fortios';
+    }
+}
diff --git a/includes/polling/os/fortios.inc.php b/includes/polling/os/fortios.inc.php
new file mode 100644
index 000000000..9101e1221
--- /dev/null
+++ b/includes/polling/os/fortios.inc.php
@@ -0,0 +1,3 @@
+<?php
+
+$serial = snmp_get($device, 'fnSysSerial', '-OQv', 'FORTINET-FORTIANALYZER-MIB');