diff --git a/includes/discovery/os/ciscosb.inc.php b/includes/discovery/os/ciscosb.inc.php
index bdc165618..89b7ce524 100644
--- a/includes/discovery/os/ciscosb.inc.php
+++ b/includes/discovery/os/ciscosb.inc.php
@@ -1,8 +1,6 @@
 <?php
-
-if (!$os)
-{
-  if (strstr($sysObjectId, ".1.3.6.1.4.1.9.6.1.83")) { $os = "ciscosb"; }
+if (!$os) {
+    if (strstr($sysObjectId, ".1.3.6.1.4.1.9.6.1.82")) { $os = "ciscosb"; }
+    if (strstr($sysObjectId, ".1.3.6.1.4.1.9.6.1.83")) { $os = "ciscosb"; }
 }
-
-?>
\ No newline at end of file
+?>
diff --git a/includes/polling/os/ciscosb.inc.php b/includes/polling/os/ciscosb.inc.php
new file mode 100644
index 000000000..ef6320633
--- /dev/null
+++ b/includes/polling/os/ciscosb.inc.php
@@ -0,0 +1,16 @@
+<?php
+/*
+* LibreNMS Cisco Small Business OS information module
+*
+* Copyright (c) 2015 Mike Rostermund <mike@kollegienet.dk>
+* 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.
+*/
+$version = trim(snmp_get($device, "SNMPv2-SMI::enterprises.9.6.1.101.2.4.0", "-Ovq") , '" ');
+$hardware = trim(snmp_get($device, "SNMPv2-SMI::enterprises.9.6.1.101.53.14.1.11.1", "-Ovq") , '" ');
+$serial = trim(snmp_get($device, "SNMPv2-SMI::enterprises.9.6.1.101.53.14.1.5.1", "-Ovq") , '" ');
+$features = trim(snmp_get($device, "SNMPv2-SMI::enterprises.9.6.1.101.53.14.1.7.1", "-Ovq") , '" ');
+?>