diff --git a/DeviceMatrix.txt b/DeviceMatrix.txt
index d409ef55..e26b3a14 100644
--- a/DeviceMatrix.txt
+++ b/DeviceMatrix.txt
@@ -335,6 +335,40 @@ device: 2350,2360,2361,2380,2382
 device-vendor: Bay
 note: See Avaya
 
+#
+# Brocade
+#
+device-vendor: Brocade
+arpnip: yes
+cdp: yes
+duplex: link
+macsuck: yes
+modules: no
+portmac: yes
+vlan: yes
+class: Layer3::Foundry
+
+device-family: EdgeIron
+device: EdgeIron 24G
+note: Bug where spanning tree stuff loops forever when polled by SNMP.
+
+device-family: FastIron
+ver: 1
+note: Support very limited
+device: FastIron 4802
+
+device-family: FastIron CX (ICX) series
+device: 6430,6450,6610
+
+device-family: FastIron LS (FLS) series
+device: All
+
+device-family: FastIron WorkGroup Switch (FWS) series
+device: All
+
+device-family: ServerIron GT series
+device: All
+
 #
 # CISCO
 #
@@ -718,36 +752,7 @@ note: LLDP support might be available. See note in Layer3::Pf
 # Foundry
 #
 device-vendor: Foundry Networks
-vlan: yes
-modules: no
-
-device-family: FastIron
-class: Layer3::Foundry
-ver: 1
-note: Support very limited
-
-device: FastIron 4802
-
-device-family: EdgeIron
-ver: 2
-class: Layer3::Foundry
-cdp: yes
-duplex: yes
-macsuck: yes
-device: EdgeIron 24G
-note: Bug where spanning tree stuff loops forever when polled by SNMP.
-
-device-family: IronWare
-class: Layer3::Foundry
-ver: 2
-cdp: yes
-note: FDP enabled.
-duplex: yes
-macsuck: yes
-arpnip: yes
-device: FWSX424 
-device: ServerIronGT
-device: FLS624, FLS648
+note: See Brocade
 
 #
 # HP
diff --git a/Info.pm b/Info.pm
index 325b9842..4ea61036 100644
--- a/Info.pm
+++ b/Info.pm
@@ -343,7 +343,7 @@ See documentation in L<SNMP::Info::EtherLike> for details.
 
 =item SNMP::Info::FDP
 
-Foundry Discovery Protocol.  F<FOUNDRY-SN-SWITCH-GROUP-MIB>
+Foundry (Brocade) Discovery Protocol.  F<FOUNDRY-SN-SWITCH-GROUP-MIB>
 
 See documentation in L<SNMP::Info::FDP> for details.
 
@@ -731,7 +731,7 @@ See documentation in L<SNMP::Info::Layer3::Force10> for details.
 
 =item SNMP::Info::Layer3::Foundry
 
-Subclass for Foundry Network devices.
+Subclass for Brocade (Foundry) Network devices.
 
 See documentation in L<SNMP::Info::Layer3::Foundry> for details.
 
diff --git a/Info/Entity.pm b/Info/Entity.pm
index ff85ba29..193a7bb6 100644
--- a/Info/Entity.pm
+++ b/Info/Entity.pm
@@ -138,7 +138,7 @@ Max Baker
 
 =head1 DESCRIPTION
 
-F<ENTITY-MIB> is used by Layer 2 devices from HP, Aironet, Foundry, Cisco,
+F<ENTITY-MIB> is used by Layer 2 devices from Brocade, Cisco, HP,
 and more.
 
 See RFC 2737 for full details.
diff --git a/Info/FDP.pm b/Info/FDP.pm
index 84eb498f..62419782 100644
--- a/Info/FDP.pm
+++ b/Info/FDP.pm
@@ -178,8 +178,7 @@ interface to FDP information through SNMP.
 FDP is a Layer 2 protocol that supplies topology information of
 devices that also speak FDP, mostly switches and routers.  It has
 similar functionality to Cisco's CDP, and the SNMP interface is
-virtually identical.  FDP is implemented in Foundry devices, including
-the Bigiron and Fastiron range.
+virtually identical.  FDP is implemented in Brocade (Foundry) devices.
 
 Create or use a device subclass that inherits this class.  Do not use
 directly.
diff --git a/Info/Layer3.pm b/Info/Layer3.pm
index 1019e34f..f2a87faa 100644
--- a/Info/Layer3.pm
+++ b/Info/Layer3.pm
@@ -318,7 +318,7 @@ sub vendor {
     return 'cisco'   if $id =~ /^\Q.1.3.6.1.4.1.9.1.\E\d+$/;
     return 'cisco'   if $id =~ /^\Q.1.3.6.1.4.1.9.9.368.4.\E\d+/;
     return 'cisco'   if ( $descr =~ /(cisco|\bios\b)/i );
-    return 'foundry' if ( $descr =~ /foundry/i );
+    return 'brocade' if ( $descr =~ /foundry/i );
 
     return 'unknown';
 
diff --git a/Info/Layer3/Foundry.pm b/Info/Layer3/Foundry.pm
index 8eb60dd0..83cec65c 100644
--- a/Info/Layer3/Foundry.pm
+++ b/Info/Layer3/Foundry.pm
@@ -157,11 +157,11 @@ sub model {
 }
 
 sub os {
-    return 'foundry';
+    return 'brocade';
 }
 
 sub vendor {
-    return 'foundry';
+    return 'brocade';
 }
 
 sub os_ver {
@@ -275,7 +275,8 @@ __END__
 
 =head1 NAME
 
-SNMP::Info::Layer3::Foundry - SNMP Interface to Foundry Network Devices
+SNMP::Info::Layer3::Foundry - SNMP Interface to Brocade (Foundry) Network
+Devices
 
 =head1 AUTHOR
 
@@ -299,7 +300,7 @@ Max Baker
 
 =head1 DESCRIPTION
 
-Abstraction subclass for Foundry Networks devices.
+Abstraction subclass for Brocade (Foundry) Networks devices.
 
 For speed or debugging purposes you can call the subclass directly, but not
 after determining a more specific class using the method above.
@@ -351,11 +352,11 @@ and removes 'C<sn>'.  EdgeIron models determined through F<ENTITY-MIB>.
 
 =item $foundry->vendor()
 
-Returns 'foundry'
+Returns 'brocade'
 
 =item $foundry->os()
 
-Returns 'foundry'
+Returns 'brocade'
 
 =item $foundry->os_ver()