diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 618f871b39..762034ea93 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -634,6 +634,12 @@ $config['os'][$os]['icon']             = 'avaya';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Device Traffic';
 
+$os = 'avaya-ipo';
+$config['os'][$os]['text']             = 'IP Office Firmware';
+$config['os'][$os]['type']             = 'network';
+$config['os'][$os]['icon']             = 'avaya';
+
+
 $os = 'arista_eos';
 $config['os'][$os]['text']             = 'Arista EOS';
 $config['os'][$os]['type']             = 'network';
diff --git a/includes/discovery/os/avaya-ipo.inc.php b/includes/discovery/os/avaya-ipo.inc.php
new file mode 100644
index 0000000000..ec4dcfbae5
--- /dev/null
+++ b/includes/discovery/os/avaya-ipo.inc.php
@@ -0,0 +1,7 @@
+<?php
+
+if (!$os) {
+    if (strstr(snmp_get($device, 'ENTITY-MIB::entPhysicalDescr.1', '-Oqvn'), 'Avaya IP Office')) {
+        $os = "avaya-ipo";
+    }
+}
diff --git a/includes/polling/os/avaya-ipo.inc.php b/includes/polling/os/avaya-ipo.inc.php
new file mode 100644
index 0000000000..d97af21439
--- /dev/null
+++ b/includes/polling/os/avaya-ipo.inc.php
@@ -0,0 +1,8 @@
+<?php
+
+echo 'Scanning Avaya IP Office...';
+
+$sysObjectID = snmp_get($device, 'sysObjectID.0', '-Oqvn');
+
+$version = snmp_get($device, 'SNMPv2-MIB::sysDescr.0', '-Oqvn');
+$hardware = snmp_get($device, 'ENTITY-MIB::entPhysicalDescr.1', '-Oqvn');