diff --git a/ChangeLog b/ChangeLog
index 496042de..043e7406 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ version 2.02 ()
     + [3051443] Add PoE measured power per port to Cisco, Extrme and HP 
       classes (jeroenvi)
     * Minor tweaks to support devices without sysServices
+    * Added Cisco CBS3xxx blade switches to L3::C6500
 
 version 2.01 (06/12/09)
     + Added CiscoStpExtensions Class (Carlos Vicente)
diff --git a/DeviceMatrix.txt b/DeviceMatrix.txt
index ee7c4a15..bbd7a970 100644
--- a/DeviceMatrix.txt
+++ b/DeviceMatrix.txt
@@ -301,6 +301,11 @@ class: Layer3::C6500
 
 device: 3750
 
+device-family: Catalyst Blade Switch 3xxx
+macsuck: vlan
+class: Layer3::C6500
+note: Cisco Blade switches for Dell, FSC, HP and IBM blade system chassis. Limited testing done.
+
 device-family: Catalyst 4000
 duplex: write
 macsuck: vlan
diff --git a/Info.pm b/Info.pm
index 6d649624..6a1c910b 100644
--- a/Info.pm
+++ b/Info.pm
@@ -1260,6 +1260,10 @@ sub device_type {
         $objtype = 'SNMP::Info::Layer3::C6500'
             if $desc =~ /(s72033_rp|s3223_rp|s32p3_rp|s222_rp)/;
 
+        # Various Cisco blade switches, CBS30x0 and CBS31x0 models
+        $objtype = 'SNMP::Info::Layer3::C6500'
+            if ( $desc =~ /cisco/i and $desc =~ /CBS3[0-9A-Za-z]{3}/ );
+
         # HP, older ProCurve models (1600, 2400, 2424m, 4000, 8000)
         $objtype = 'SNMP::Info::Layer2::HP4000'
             if $desc =~ /\b(J4093A|J4110A|J4120A|J4121A|J4122A|J4122B)\b/;