diff --git a/ChangeLog b/ChangeLog
index ccccb181..1ad3a60f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 SNMP::Info - Perl5 OO Interface to Network Devices and SNMP MIBs
 ChangeLog $Id$
 
+version 0.8 ()
+    * Added C3500XL devices to the Layer2::C2900 class
+
 version 0.7 (08/14/03)
     * Added Class for Catalyst 6500 Series - Layer3::C6500
     * Added CiscoVTP support to 3550,2900, and Catalyst classes
diff --git a/DeviceMatrix.txt b/DeviceMatrix.txt
index 6a58b628..900a928f 100644
--- a/DeviceMatrix.txt
+++ b/DeviceMatrix.txt
@@ -174,7 +174,8 @@ device: 2924CXLv
 
 device-family: Catalyst 3500 XL
 portmac: yes
-note: L2 only IOS devices
+macsuck: vlan
+note: L2 only IOS devices - Just like Catalyst 2900 series from SNMP
 class: Layer2
 
 device: 3508GXL
@@ -182,7 +183,6 @@ device: 3508GXL
 device: 3524XL
 
 device: 3548XL
-macsuck: no
 
 device-family: Catalyst 3550
 macsuck: vlan
diff --git a/Info.pm b/Info.pm
index a344aa88..07a02105 100644
--- a/Info.pm
+++ b/Info.pm
@@ -9,7 +9,7 @@
 # See COPYRIGHT at bottom
 
 package SNMP::Info;
-$VERSION = 0.7;
+$VERSION = 0.8;
 use strict;
 
 use Exporter;
@@ -29,7 +29,7 @@ SNMP::Info - Object Oriented Perl5 Interface to Network devices and MIBs through
 
 =head1 VERSION
 
-SNMP::Info - Version 0.7
+SNMP::Info - Version 0.8
 
 =head1 AUTHOR
 
@@ -348,7 +348,7 @@ Subclass for Cisco Catalyst 1900 and 1900c Devices running CatOS.
 
 =item SNMP::Info::Layer2::C2900
 
-Subclass for Cisco Catalyst 2900 devices running IOS.
+Subclass for Cisco Catalyst 2900 and 3500XL devices running IOS.
 
 =item SNMP::Info::Layer2::Catalyst
 
@@ -611,6 +611,7 @@ Algorithm for Subclass Detection:
             Bay Networks                   -> SNMP::Info::Layer2::Bay
             Catalyst 1900                  -> SNMP::Info::Layer2::C1900
             Catalyst 2900XL/2950(IOS)      -> SNMP::Info::Layer2::C2900
+            Catalyst 3500XL (3548) IOS     -> SNMP::Info::Layer2::C2900
             Catalyst 3550/3548             -> SNMP::Info::Layer3::C3550
             Catalyst WS-C 2926,5xxx        -> SNMP::Info::Layer2::Catalyst
             HP Procurve                    -> SNMP::Info::Layer2::HP
@@ -657,8 +658,8 @@ sub device_type {
         #   Catalyst 1900 series override
         $objtype = 'SNMP::Info::Layer2::C1900' if ($desc =~ /catalyst/i and $desc =~ /\D19\d{2}/);
 
-        #   Catalyst 2900 (IOS) series override
-        $objtype = 'SNMP::Info::Layer2::C2900' if ($desc =~ /(C2900XL|C2950)/ );
+        #   Catalyst 2900 and 3500XL (IOS) series override
+        $objtype = 'SNMP::Info::Layer2::C2900' if ($desc =~ /(C2900XL|C2950|C3500XL)/ );
 
         #   Catalyst WS-C series override 2926,4k,5k,6k in Hybrid
         $objtype = 'SNMP::Info::Layer2::Catalyst' if ($desc =~ /WS-C\d{4}/);