diff --git a/ChangeLog b/ChangeLog
index 02358297..78f1f428 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,10 @@ version 3.09 ()
       L3::IBMGbTor
     * [] set_i_untagged combines both set_i_vlan and set_i_pvid in one method
 
+   [ENHANCEMENTS]
+
+    * Remove "Switch" from model name in L3::Foundry
+
    [BUG FIXES]
 
     * Modify _xos_i_vlan_membership() in L3::Extreme to only include tagged
diff --git a/Info/Layer3/Foundry.pm b/Info/Layer3/Foundry.pm
index 593b4813..85f3c820 100644
--- a/Info/Layer3/Foundry.pm
+++ b/Info/Layer3/Foundry.pm
@@ -163,6 +163,7 @@ sub model {
     return $id unless defined $model;
 
     $model =~ s/^sn//;
+    $model =~ s/Switch//;
 
     return $model;
 }
@@ -866,7 +867,8 @@ These are methods that return scalar value from SNMP
 =item $foundry->model()
 
 Returns model type.  Checks $foundry->id() against the F<FOUNDRY-SN-ROOT-MIB>
-and removes 'C<sn>'.  EdgeIron models determined through F<ENTITY-MIB>.  
+and removes 'C<sn>' and 'C<Switch>'.  EdgeIron models determined
+through F<ENTITY-MIB>.  
 
 =item $foundry->vendor()