diff --git a/ChangeLog b/ChangeLog
index 043e7406..95282531 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@ version 2.02 ()
       classes (jeroenvi)
     * Minor tweaks to support devices without sysServices
     * Added Cisco CBS3xxx blade switches to L3::C6500
+    * Fix for FWSMs not being detected properly.  Special thanks goes to
+      Jukka Pirhonen for pointing it out. (Brian De Wolf)
 
 version 2.01 (06/12/09)
     + Added CiscoStpExtensions Class (Carlos Vicente)
diff --git a/Info.pm b/Info.pm
index 6a1c910b..09781a0a 100644
--- a/Info.pm
+++ b/Info.pm
@@ -1292,6 +1292,10 @@ sub device_type {
         $objtype = 'SNMP::Info::Layer2::Allied'
             if ( $desc =~ /Allied.*AT-80\d{2}\S*/i );
 
+        # Cisco FWSM
+        $objtype = 'SNMP::Info::Layer3::CiscoFWSM'
+            if ( $desc =~ /Cisco Firewall Services Module/i );
+
         # Generic device classification based upon sysObjectID
         if (    ( $objtype eq 'SNMP::Info::Layer3' )
             and ( defined($id) )
@@ -1442,10 +1446,6 @@ sub device_type {
         $objtype = 'SNMP::Info::Layer3::Cisco'
             if ( $desc =~ /Cisco Adaptive Security Appliance/i );
 
-        # Cisco FWSM
-        $objtype = 'SNMP::Info::Layer3::CiscoFWSM'
-            if ( $desc =~ /Cisco Firewall Services Module/i );
-
         # Generic device classification based upon sysObjectID
         if ( defined($id) ) {
             if ( defined $l3sysoidmap{$id} ) {