diff --git a/includes/discovery/os/pbn.inc.php b/includes/discovery/os/pbn.inc.php
index d8930fbb9..d2a5a805c 100644
--- a/includes/discovery/os/pbn.inc.php
+++ b/includes/discovery/os/pbn.inc.php
@@ -1,9 +1,8 @@
 <?php
 
 if (!$os) {
-    if (preg_match("/^Pacific Broadband Networks/", $sysDescr)) {
-	$os = "pbn";
-    }
+    if (strstr($sysObjectId, ".1.3.6.1.4.1.11606")) { $os = "pbn"; }
+
 }
 
 ?>
diff --git a/includes/polling/os/pbn.inc.php b/includes/polling/os/pbn.inc.php
index aae6675f2..d498dddf8 100644
--- a/includes/polling/os/pbn.inc.php
+++ b/includes/polling/os/pbn.inc.php
@@ -3,6 +3,13 @@
 if (preg_match('/^Pacific Broadband Networks .+\n.+ Version ([^,]+), .+\n.+\n.+\nSerial num:([^,]+), .+/', $poll_device['sysDescr'], $regexp_result)) {
 	$version = $regexp_result[1];
 	$serial = $regexp_result[2];
+	
+# for PBN CPE 120/121 	
+} elseif (strstr(snmp_get($device, "SNMPv2-MIB::sysObjectID.0", "-Ovqn"), ".1.3.6.1.4.1.11606.24.1.1.10")) {
+	$version = snmp_get($device, "1.3.6.1.4.1.11606.24.1.1.6.0", "-Ovq");
+	$hardware = snmp_get($device, "1.3.6.1.4.1.11606.24.1.1.7.0", "-Ovq");
+	$features = snmp_get($device, "1.3.6.1.4.1.11606.24.1.1.10.0", "-Ovq");
+	$serial = snmp_get($device, "1.3.6.1.4.1.11606.24.1.1.4.0", "-Ovq");
 }
 
 ?>