diff --git a/includes/discovery/os/fiberhome.inc.php b/includes/discovery/os/fiberhome.inc.php
new file mode 100644
index 0000000000..edab83d084
--- /dev/null
+++ b/includes/discovery/os/fiberhome.inc.php
@@ -0,0 +1,13 @@
+<?php
+if (!$os){
+    /**
+     * Supported Devides List
+     * OLT AN5516-06
+     * OLT AN5516-01
+     */
+    if (preg_match('/^AN5516-0[16]$/',$sysDescr)) {
+        echo "Fiberhome $sysDescr\n";
+        $os = "fiberhome";
+    }
+}
+?>
\ No newline at end of file
diff --git a/includes/polling/os/fiberhome.inc.php b/includes/polling/os/fiberhome.inc.php
new file mode 100644
index 0000000000..3810bbd73c
--- /dev/null
+++ b/includes/polling/os/fiberhome.inc.php
@@ -0,0 +1,5 @@
+<?php
+$hardware = "Fiberhome ".snmp_get($device, "sysDescr.0", "-Oqv", "GEPON-OLT-COMMON-MIB");
+$version  = str_replace('"','',snmp_get($device, "sysHardVersion.0", "-Ovq", "GEPON-OLT-COMMON-MIB"))." - ".str_replace('"','',snmp_get($device, "sysSoftVersion.0", "-Ovq", "GEPON-OLT-COMMON-MIB"));
+$features  = "Olt ".snmp_get($device, "sysDescr.0", "-Oqv", "GEPON-OLT-COMMON-MIB");
+?>
\ No newline at end of file