diff --git a/ChangeLog b/ChangeLog
index 51752ab9..5e90571f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 SNMP::Info - Friendly OO-style interface to Network devices using SNMP.
 
-version 3.21 ()
+version 3.21_001 (2014-11-14)
 
    [NEW FEATURES]
 
@@ -28,6 +28,7 @@ version 3.21 ()
       trunking but are not in operational trunking mode
     * Correct munging of stp_p_port(), i_stp_port(), and stp_root() methods
       in Bridge
+    * In LLDP.pm don't create a variable in a conditional
 
 version 3.20 (2014-09-08)
 
diff --git a/Info.pm b/Info.pm
index be601495..de62f7a3 100644
--- a/Info.pm
+++ b/Info.pm
@@ -24,7 +24,7 @@ use vars
     qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG %SPEED_MAP
     $NOSUCH $BIGINT $REPEATERS/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 =head1 NAME
 
@@ -32,7 +32,7 @@ SNMP::Info - OO Interface to Network devices and MIBs through SNMP
 
 =head1 VERSION
 
-SNMP::Info - Version 3.20
+SNMP::Info - Version 3.21_001
 
 =head1 AUTHOR
 
diff --git a/Info/AMAP.pm b/Info/AMAP.pm
index 6485cfa4..ae500de6 100644
--- a/Info/AMAP.pm
+++ b/Info/AMAP.pm
@@ -38,7 +38,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS
     = ( 'ALCATEL-IND1-INTERSWITCH-PROTOCOL-MIB' => 'aipAMAPRemDeviceType', );
diff --git a/Info/AdslLine.pm b/Info/AdslLine.pm
index acd39859..847a18fc 100644
--- a/Info/AdslLine.pm
+++ b/Info/AdslLine.pm
@@ -38,7 +38,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = ( 'ADSL-LINE-MIB' => 'adslLineType' );
 
diff --git a/Info/Aggregate.pm b/Info/Aggregate.pm
index 18561d90..0ce47466 100644
--- a/Info/Aggregate.pm
+++ b/Info/Aggregate.pm
@@ -38,7 +38,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (); # IF-MIB
 
diff --git a/Info/Airespace.pm b/Info/Airespace.pm
index 6ec2e9e0..af1b4ffe 100644
--- a/Info/Airespace.pm
+++ b/Info/Airespace.pm
@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::MIBS,
diff --git a/Info/Bridge.pm b/Info/Bridge.pm
index 01bae569..922f10b7 100644
--- a/Info/Bridge.pm
+++ b/Info/Bridge.pm
@@ -42,7 +42,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     'BRIDGE-MIB'   => 'dot1dBaseBridgeAddress',
diff --git a/Info/CDP.pm b/Info/CDP.pm
index c2f2d2fd..44d1bf3a 100644
--- a/Info/CDP.pm
+++ b/Info/CDP.pm
@@ -43,7 +43,7 @@ use SNMP::Info;
 use vars
     qw/$VERSION $DEBUG %FUNCS %GLOBALS %MIBS %MUNGE $INIT %CDP_CAPABILITIES/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 # Five data structures required by SNMP::Info
 %MIBS = ( 'CISCO-CDP-MIB' => 'cdpGlobalRun' );
diff --git a/Info/CiscoAgg.pm b/Info/CiscoAgg.pm
index 2ea0c8f6..25f1ebd0 100644
--- a/Info/CiscoAgg.pm
+++ b/Info/CiscoAgg.pm
@@ -43,7 +43,7 @@ use SNMP::Info::IEEE802dot3ad 'agg_ports_lag';
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
   %SNMP::Info::IEEE802dot3ad::MIBS,
diff --git a/Info/CiscoConfig.pm b/Info/CiscoConfig.pm
index 46f88210..2960c16c 100644
--- a/Info/CiscoConfig.pm
+++ b/Info/CiscoConfig.pm
@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     'CISCO-CONFIG-COPY-MIB' => 'ccCopyTable',
diff --git a/Info/CiscoPortSecurity.pm b/Info/CiscoPortSecurity.pm
index 10a149b7..9b845fd0 100644
--- a/Info/CiscoPortSecurity.pm
+++ b/Info/CiscoPortSecurity.pm
@@ -38,7 +38,7 @@ use Exporter;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE %PAECAPABILITIES/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     'CISCO-PORT-SECURITY-MIB' => 'ciscoPortSecurityMIB',
diff --git a/Info/CiscoPower.pm b/Info/CiscoPower.pm
index 15a92091..4b018d1f 100644
--- a/Info/CiscoPower.pm
+++ b/Info/CiscoPower.pm
@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = ( 'CISCO-POWER-ETHERNET-EXT-MIB' => 'cpeExtPsePortEntPhyIndex',
           'CISCO-CDP-MIB' => 'cdpCachePowerConsumption' );
diff --git a/Info/CiscoQOS.pm b/Info/CiscoQOS.pm
index f6f55e57..5c7be93e 100644
--- a/Info/CiscoQOS.pm
+++ b/Info/CiscoQOS.pm
@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = ( 'CISCO-CLASS-BASED-QOS-MIB' => 'cbQosIfIndex', );
 
diff --git a/Info/CiscoRTT.pm b/Info/CiscoRTT.pm
index 11dc40bd..b98c57b6 100644
--- a/Info/CiscoRTT.pm
+++ b/Info/CiscoRTT.pm
@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = ( 'CISCO-RTTMON-MIB' => 'rttMonCtrlAdminOwner', );
 
diff --git a/Info/CiscoStack.pm b/Info/CiscoStack.pm
index 5cd83115..b964644e 100644
--- a/Info/CiscoStack.pm
+++ b/Info/CiscoStack.pm
@@ -38,7 +38,7 @@ use Exporter;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE %PORTSTAT/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = ( 'CISCO-STACK-MIB' => 'ciscoStackMIB', );
 
diff --git a/Info/CiscoStats.pm b/Info/CiscoStats.pm
index a04beffc..65f3dd18 100644
--- a/Info/CiscoStats.pm
+++ b/Info/CiscoStats.pm
@@ -42,7 +42,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     'SNMPv2-MIB'            => 'sysDescr',
diff --git a/Info/CiscoStpExtensions.pm b/Info/CiscoStpExtensions.pm
index c7eafb59..8a0c216c 100644
--- a/Info/CiscoStpExtensions.pm
+++ b/Info/CiscoStpExtensions.pm
@@ -36,7 +36,7 @@ use SNMP::Info::Bridge;
 
 use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE %PORTSTAT $INIT/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 @SNMP::Info::CiscoStpExtensions::ISA = qw/SNMP::Info::Bridge SNMP::Info Exporter/;
 @SNMP::Info::CiscoStpExtensions::EXPORT_OK = qw//;
diff --git a/Info/CiscoVTP.pm b/Info/CiscoVTP.pm
index 390940c5..cc3d25a3 100644
--- a/Info/CiscoVTP.pm
+++ b/Info/CiscoVTP.pm
@@ -41,7 +41,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     'CISCO-VTP-MIB'                       => 'vtpVlanName',
diff --git a/Info/EDP.pm b/Info/EDP.pm
index 5d46e4fd..32577d98 100644
--- a/Info/EDP.pm
+++ b/Info/EDP.pm
@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     'EXTREME-EDP-MIB'   => 'extremeEdpPortIfIndex',
diff --git a/Info/Entity.pm b/Info/Entity.pm
index 44528e67..67cbb082 100644
--- a/Info/Entity.pm
+++ b/Info/Entity.pm
@@ -41,7 +41,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = ( 'ENTITY-MIB' => 'entPhysicalSerialNum' );
 
diff --git a/Info/EtherLike.pm b/Info/EtherLike.pm
index ffaada9e..63d42d39 100644
--- a/Info/EtherLike.pm
+++ b/Info/EtherLike.pm
@@ -41,7 +41,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = ( 'EtherLike-MIB' => 'etherMIB' );
 
diff --git a/Info/FDP.pm b/Info/FDP.pm
index 1d3463a2..e380cf2c 100644
--- a/Info/FDP.pm
+++ b/Info/FDP.pm
@@ -42,7 +42,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = ( 'FOUNDRY-SN-SWITCH-GROUP-MIB' => 'snFdpGlobalRun' );
 
diff --git a/Info/IEEE802dot11.pm b/Info/IEEE802dot11.pm
index 56f5299b..4c240569 100644
--- a/Info/IEEE802dot11.pm
+++ b/Info/IEEE802dot11.pm
@@ -38,7 +38,7 @@ use Exporter;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = ( 'IEEE802dot11-MIB' => 'dot11DesiredSSID', );
 
diff --git a/Info/IEEE802dot3ad.pm b/Info/IEEE802dot3ad.pm
index dafa2db5..e8dab712 100644
--- a/Info/IEEE802dot3ad.pm
+++ b/Info/IEEE802dot3ad.pm
@@ -43,7 +43,7 @@ use SNMP::Info::Aggregate;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
   %SNMP::Info::Aggregate::MIBS,
diff --git a/Info/IPv6.pm b/Info/IPv6.pm
index 83e64f38..e1d6eec1 100644
--- a/Info/IPv6.pm
+++ b/Info/IPv6.pm
@@ -44,7 +44,7 @@ use constant {
     IPV6MIB => 3,
 };
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 
 
diff --git a/Info/Layer1.pm b/Info/Layer1.pm
index 82fabfcc..943cac35 100644
--- a/Info/Layer1.pm
+++ b/Info/Layer1.pm
@@ -41,7 +41,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = ( %SNMP::Info::MIBS, 'SNMP-REPEATER-MIB' => 'rptrPortGroupIndex' );
 
diff --git a/Info/Layer1/Allied.pm b/Info/Layer1/Allied.pm
index 3246738a..4eb61657 100644
--- a/Info/Layer1/Allied.pm
+++ b/Info/Layer1/Allied.pm
@@ -41,7 +41,7 @@ use SNMP::Info::Layer1;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer1::GLOBALS, 'root_ip' => 'actualIPAddr', );
diff --git a/Info/Layer1/Asante.pm b/Info/Layer1/Asante.pm
index b597d6c8..c231c459 100644
--- a/Info/Layer1/Asante.pm
+++ b/Info/Layer1/Asante.pm
@@ -41,7 +41,7 @@ use SNMP::Info::Layer1;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer1::GLOBALS, );
diff --git a/Info/Layer1/Bayhub.pm b/Info/Layer1/Bayhub.pm
index 292caaa2..a71c9770 100644
--- a/Info/Layer1/Bayhub.pm
+++ b/Info/Layer1/Bayhub.pm
@@ -42,7 +42,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,
diff --git a/Info/Layer1/Cyclades.pm b/Info/Layer1/Cyclades.pm
index 84450130..4789fbe2 100644
--- a/Info/Layer1/Cyclades.pm
+++ b/Info/Layer1/Cyclades.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer1;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer1::MIBS,
diff --git a/Info/Layer1/S3000.pm b/Info/Layer1/S3000.pm
index 2977e530..e318e7b9 100644
--- a/Info/Layer1/S3000.pm
+++ b/Info/Layer1/S3000.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,
diff --git a/Info/Layer2.pm b/Info/Layer2.pm
index 62418c8d..29e5b744 100644
--- a/Info/Layer2.pm
+++ b/Info/Layer2.pm
@@ -45,7 +45,7 @@ use SNMP::Info::PowerEthernet;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::MIBS,         %SNMP::Info::Bridge::MIBS,
diff --git a/Info/Layer2/3Com.pm b/Info/Layer2/3Com.pm
index 6a8919fe..a1997c5a 100644
--- a/Info/Layer2/3Com.pm
+++ b/Info/Layer2/3Com.pm
@@ -11,7 +11,7 @@ use SNMP::Info::CDP;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::LLDP::MIBS,
diff --git a/Info/Layer2/Airespace.pm b/Info/Layer2/Airespace.pm
index 33cc2b03..ef5777df 100644
--- a/Info/Layer2/Airespace.pm
+++ b/Info/Layer2/Airespace.pm
@@ -40,7 +40,7 @@ use SNMP::Info::Airespace;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::MIBS,      %SNMP::Info::Bridge::MIBS,
diff --git a/Info/Layer2/Aironet.pm b/Info/Layer2/Aironet.pm
index ebad742d..e3b3d87a 100644
--- a/Info/Layer2/Aironet.pm
+++ b/Info/Layer2/Aironet.pm
@@ -49,7 +49,7 @@ use SNMP::Info::IEEE802dot11;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %GLOBALS = (
     %SNMP::Info::IEEE802dot11::GLOBALS,
diff --git a/Info/Layer2/Allied.pm b/Info/Layer2/Allied.pm
index 4701f61d..0f829e36 100644
--- a/Info/Layer2/Allied.pm
+++ b/Info/Layer2/Allied.pm
@@ -40,7 +40,7 @@ use SNMP::Info::Layer1;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS );
 
diff --git a/Info/Layer2/Baystack.pm b/Info/Layer2/Baystack.pm
index 600896f8..e1bd2974 100644
--- a/Info/Layer2/Baystack.pm
+++ b/Info/Layer2/Baystack.pm
@@ -46,7 +46,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,    %SNMP::Info::LLDP::MIBS,
diff --git a/Info/Layer2/C1900.pm b/Info/Layer2/C1900.pm
index 0d20dfd3..89beb5b0 100644
--- a/Info/Layer2/C1900.pm
+++ b/Info/Layer2/C1900.pm
@@ -48,7 +48,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %GLOBALS = (
     %SNMP::Info::Layer2::GLOBALS,
diff --git a/Info/Layer2/C2900.pm b/Info/Layer2/C2900.pm
index a8b7b9b4..c850960d 100644
--- a/Info/Layer2/C2900.pm
+++ b/Info/Layer2/C2900.pm
@@ -41,7 +41,7 @@ use SNMP::Info::Layer2::Cisco;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %GLOBALS = (
     %SNMP::Info::Layer2::Cisco::GLOBALS,
diff --git a/Info/Layer2/Catalyst.pm b/Info/Layer2/Catalyst.pm
index 9878244d..de388121 100644
--- a/Info/Layer2/Catalyst.pm
+++ b/Info/Layer2/Catalyst.pm
@@ -42,7 +42,7 @@ use SNMP::Info::Layer2::Cisco;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer2::Cisco::MIBS,
diff --git a/Info/Layer2/Centillion.pm b/Info/Layer2/Centillion.pm
index 0bc9e709..d172f5d8 100644
--- a/Info/Layer2/Centillion.pm
+++ b/Info/Layer2/Centillion.pm
@@ -43,7 +43,7 @@ use SNMP::Info::SONMP;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::MIBS,
diff --git a/Info/Layer2/Cisco.pm b/Info/Layer2/Cisco.pm
index b4522edf..5111bfd8 100644
--- a/Info/Layer2/Cisco.pm
+++ b/Info/Layer2/Cisco.pm
@@ -52,7 +52,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,
diff --git a/Info/Layer2/CiscoSB.pm b/Info/Layer2/CiscoSB.pm
index 1906cfa9..19524484 100644
--- a/Info/Layer2/CiscoSB.pm
+++ b/Info/Layer2/CiscoSB.pm
@@ -50,7 +50,7 @@ use SNMP::Info::CDP;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 # This will be filled in with the device's index into the EntPhysicalEntry
 # table by the serial() function.
diff --git a/Info/Layer2/HP.pm b/Info/Layer2/HP.pm
index ae450067..49b67994 100644
--- a/Info/Layer2/HP.pm
+++ b/Info/Layer2/HP.pm
@@ -52,7 +52,7 @@ use SNMP::Info::Aggregate;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MODEL_MAP %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer2/HP4000.pm b/Info/Layer2/HP4000.pm
index 12f32717..84f2529d 100644
--- a/Info/Layer2/HP4000.pm
+++ b/Info/Layer2/HP4000.pm
@@ -44,7 +44,7 @@ use SNMP::Info::CDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MODEL_MAP %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer2/HPVC.pm b/Info/Layer2/HPVC.pm
index 786e15d4..6c143b73 100644
--- a/Info/Layer2/HPVC.pm
+++ b/Info/Layer2/HPVC.pm
@@ -41,7 +41,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,
diff --git a/Info/Layer2/Kentrox.pm b/Info/Layer2/Kentrox.pm
index d48692dd..a162b492 100644
--- a/Info/Layer2/Kentrox.pm
+++ b/Info/Layer2/Kentrox.pm
@@ -36,7 +36,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,
diff --git a/Info/Layer2/N2270.pm b/Info/Layer2/N2270.pm
index f6694390..59b5fb59 100644
--- a/Info/Layer2/N2270.pm
+++ b/Info/Layer2/N2270.pm
@@ -43,7 +43,7 @@ use SNMP::Info::Airespace;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::MIBS,        %SNMP::Info::Bridge::MIBS,
diff --git a/Info/Layer2/NAP222x.pm b/Info/Layer2/NAP222x.pm
index 94caebfa..98da9aa7 100644
--- a/Info/Layer2/NAP222x.pm
+++ b/Info/Layer2/NAP222x.pm
@@ -42,7 +42,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS, %SNMP::Info::IEEE802dot11::MIBS,
diff --git a/Info/Layer2/NWSS2300.pm b/Info/Layer2/NWSS2300.pm
index c82e227f..5d94c5dc 100644
--- a/Info/Layer2/NWSS2300.pm
+++ b/Info/Layer2/NWSS2300.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Bridge;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::MIBS,
diff --git a/Info/Layer2/Netgear.pm b/Info/Layer2/Netgear.pm
index 5c8980f5..13b2ab51 100644
--- a/Info/Layer2/Netgear.pm
+++ b/Info/Layer2/Netgear.pm
@@ -40,7 +40,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 # This will be filled in with the device's index into the EntPhysicalEntry
 # table by the serial() function.
diff --git a/Info/Layer2/Orinoco.pm b/Info/Layer2/Orinoco.pm
index 15f84798..5b47d43c 100644
--- a/Info/Layer2/Orinoco.pm
+++ b/Info/Layer2/Orinoco.pm
@@ -41,7 +41,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,
diff --git a/Info/Layer2/Trapeze.pm b/Info/Layer2/Trapeze.pm
index dac201c0..e17ab3a7 100644
--- a/Info/Layer2/Trapeze.pm
+++ b/Info/Layer2/Trapeze.pm
@@ -40,7 +40,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::MIBS,
diff --git a/Info/Layer2/Ubiquiti.pm b/Info/Layer2/Ubiquiti.pm
index 2b9dbb50..a4f3c931 100644
--- a/Info/Layer2/Ubiquiti.pm
+++ b/Info/Layer2/Ubiquiti.pm
@@ -15,7 +15,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,
diff --git a/Info/Layer2/ZyXEL_DSLAM.pm b/Info/Layer2/ZyXEL_DSLAM.pm
index 48e08200..a8b7de04 100644
--- a/Info/Layer2/ZyXEL_DSLAM.pm
+++ b/Info/Layer2/ZyXEL_DSLAM.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS );
diff --git a/Info/Layer3.pm b/Info/Layer3.pm
index 6398a475..91ecf70b 100644
--- a/Info/Layer3.pm
+++ b/Info/Layer3.pm
@@ -51,7 +51,7 @@ use SNMP::Info::AdslLine;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::MIBS,
diff --git a/Info/Layer3/Aironet.pm b/Info/Layer3/Aironet.pm
index da34e92c..3d399b53 100644
--- a/Info/Layer3/Aironet.pm
+++ b/Info/Layer3/Aironet.pm
@@ -41,7 +41,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/AlcatelLucent.pm b/Info/Layer3/AlcatelLucent.pm
index 0e85e2ec..e27a1572 100644
--- a/Info/Layer3/AlcatelLucent.pm
+++ b/Info/Layer3/AlcatelLucent.pm
@@ -49,7 +49,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/AlteonAD.pm b/Info/Layer3/AlteonAD.pm
index 5ba3372a..09b7148a 100644
--- a/Info/Layer3/AlteonAD.pm
+++ b/Info/Layer3/AlteonAD.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Altiga.pm b/Info/Layer3/Altiga.pm
index 4d865729..6111a086 100644
--- a/Info/Layer3/Altiga.pm
+++ b/Info/Layer3/Altiga.pm
@@ -40,7 +40,7 @@ use SNMP::Info::Layer3;
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE 
             $int_include_vpn $fake_idx $type_class/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
             %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Arista.pm b/Info/Layer3/Arista.pm
index c061972f..a7b78acc 100644
--- a/Info/Layer3/Arista.pm
+++ b/Info/Layer3/Arista.pm
@@ -48,7 +48,7 @@ use SNMP::Info::Aggregate;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Aruba.pm b/Info/Layer3/Aruba.pm
index 02ab89dc..7ffdf637 100644
--- a/Info/Layer3/Aruba.pm
+++ b/Info/Layer3/Aruba.pm
@@ -40,7 +40,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/BayRS.pm b/Info/Layer3/BayRS.pm
index 2a85db3a..48ac50f8 100644
--- a/Info/Layer3/BayRS.pm
+++ b/Info/Layer3/BayRS.pm
@@ -43,7 +43,7 @@ use SNMP::Info::Bridge;
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE %MODEL_MAP
     %MODID_MAP %PROCID_MAP/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::MIBS,
diff --git a/Info/Layer3/BlueCoatSG.pm b/Info/Layer3/BlueCoatSG.pm
index 684c2f7e..6350c035 100644
--- a/Info/Layer3/BlueCoatSG.pm
+++ b/Info/Layer3/BlueCoatSG.pm
@@ -36,7 +36,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS, %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/C3550.pm b/Info/Layer3/C3550.pm
index 5a4df8cb..ad75e461 100644
--- a/Info/Layer3/C3550.pm
+++ b/Info/Layer3/C3550.pm
@@ -47,7 +47,7 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
 @SNMP::Info::Layer3::C3550::EXPORT_OK = qw//;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 # NOTE: Order creates precedence
 #       Example: v_name exists in Bridge.pm and CiscoVTP.pm
diff --git a/Info/Layer3/C4000.pm b/Info/Layer3/C4000.pm
index f263dab3..2a18ed29 100644
--- a/Info/Layer3/C4000.pm
+++ b/Info/Layer3/C4000.pm
@@ -44,7 +44,7 @@ use SNMP::Info::MAU;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::MAU::MIBS,
diff --git a/Info/Layer3/C6500.pm b/Info/Layer3/C6500.pm
index 565a2a35..3bdbdbb3 100644
--- a/Info/Layer3/C6500.pm
+++ b/Info/Layer3/C6500.pm
@@ -51,7 +51,7 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 # NOTE: Order creates precedence
 #       Example: v_name exists in Bridge.pm and CiscoVTP.pm
diff --git a/Info/Layer3/Cisco.pm b/Info/Layer3/Cisco.pm
index 7e72bee6..0df58d2b 100644
--- a/Info/Layer3/Cisco.pm
+++ b/Info/Layer3/Cisco.pm
@@ -55,7 +55,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/CiscoASA.pm b/Info/Layer3/CiscoASA.pm
index 30907d5a..5e54320a 100644
--- a/Info/Layer3/CiscoASA.pm
+++ b/Info/Layer3/CiscoASA.pm
@@ -45,7 +45,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = ( %SNMP::Info::Layer3::MIBS, %SNMP::Info::CiscoStats::MIBS, );
 
diff --git a/Info/Layer3/CiscoFWSM.pm b/Info/Layer3/CiscoFWSM.pm
index 7ee3a8bb..b6126964 100644
--- a/Info/Layer3/CiscoFWSM.pm
+++ b/Info/Layer3/CiscoFWSM.pm
@@ -43,7 +43,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = ( %SNMP::Info::Layer3::MIBS, %SNMP::Info::CiscoStats::MIBS, );
 
diff --git a/Info/Layer3/CiscoSwitch.pm b/Info/Layer3/CiscoSwitch.pm
index 007bb22d..ed49fbf9 100644
--- a/Info/Layer3/CiscoSwitch.pm
+++ b/Info/Layer3/CiscoSwitch.pm
@@ -50,7 +50,7 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::Cisco::MIBS,
diff --git a/Info/Layer3/Contivity.pm b/Info/Layer3/Contivity.pm
index 3cbd12a9..1dd58095 100644
--- a/Info/Layer3/Contivity.pm
+++ b/Info/Layer3/Contivity.pm
@@ -42,7 +42,7 @@ use SNMP::Info::Entity;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::MIBS, %SNMP::Info::Layer3::MIBS, %SNMP::Info::Entity::MIBS,
diff --git a/Info/Layer3/Dell.pm b/Info/Layer3/Dell.pm
index 63fe8bf5..29dec6d5 100644
--- a/Info/Layer3/Dell.pm
+++ b/Info/Layer3/Dell.pm
@@ -40,7 +40,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Enterasys.pm b/Info/Layer3/Enterasys.pm
index 32e02b11..b5dcdbed 100644
--- a/Info/Layer3/Enterasys.pm
+++ b/Info/Layer3/Enterasys.pm
@@ -44,7 +44,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS, %SNMP::Info::CDP::MIBS,
diff --git a/Info/Layer3/Extreme.pm b/Info/Layer3/Extreme.pm
index abf6736b..bc9606e8 100644
--- a/Info/Layer3/Extreme.pm
+++ b/Info/Layer3/Extreme.pm
@@ -46,7 +46,7 @@ use SNMP::Info::EDP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/F5.pm b/Info/Layer3/F5.pm
index e231d137..ad50aeaf 100644
--- a/Info/Layer3/F5.pm
+++ b/Info/Layer3/F5.pm
@@ -38,7 +38,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Force10.pm b/Info/Layer3/Force10.pm
index 33c5c99a..fb4c7729 100644
--- a/Info/Layer3/Force10.pm
+++ b/Info/Layer3/Force10.pm
@@ -43,7 +43,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Fortinet.pm b/Info/Layer3/Fortinet.pm
index 9a920aa9..f78a9faf 100644
--- a/Info/Layer3/Fortinet.pm
+++ b/Info/Layer3/Fortinet.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Foundry.pm b/Info/Layer3/Foundry.pm
index 23799adf..3f3756f3 100644
--- a/Info/Layer3/Foundry.pm
+++ b/Info/Layer3/Foundry.pm
@@ -48,7 +48,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/H3C.pm b/Info/Layer3/H3C.pm
index 68073b2b..0878d89d 100644
--- a/Info/Layer3/H3C.pm
+++ b/Info/Layer3/H3C.pm
@@ -47,7 +47,7 @@ use SNMP::Info::IEEE802dot3ad 'agg_ports_lag';
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/HP9300.pm b/Info/Layer3/HP9300.pm
index dac1d50d..02d05256 100644
--- a/Info/Layer3/HP9300.pm
+++ b/Info/Layer3/HP9300.pm
@@ -42,7 +42,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/IBMGbTor.pm b/Info/Layer3/IBMGbTor.pm
index 8e65196c..7aa10d17 100644
--- a/Info/Layer3/IBMGbTor.pm
+++ b/Info/Layer3/IBMGbTor.pm
@@ -41,7 +41,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Juniper.pm b/Info/Layer3/Juniper.pm
index 8648619c..7953e7da 100644
--- a/Info/Layer3/Juniper.pm
+++ b/Info/Layer3/Juniper.pm
@@ -40,7 +40,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Lantronix.pm b/Info/Layer3/Lantronix.pm
index f906d9bc..9556564c 100644
--- a/Info/Layer3/Lantronix.pm
+++ b/Info/Layer3/Lantronix.pm
@@ -41,7 +41,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Microsoft.pm b/Info/Layer3/Microsoft.pm
index 53fbaceb..d6429744 100644
--- a/Info/Layer3/Microsoft.pm
+++ b/Info/Layer3/Microsoft.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = ( %SNMP::Info::Layer3::MIBS, );
 
diff --git a/Info/Layer3/Mikrotik.pm b/Info/Layer3/Mikrotik.pm
index 3babfbdb..de09ce60 100644
--- a/Info/Layer3/Mikrotik.pm
+++ b/Info/Layer3/Mikrotik.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/N1600.pm b/Info/Layer3/N1600.pm
index 8c172b71..202583f5 100644
--- a/Info/Layer3/N1600.pm
+++ b/Info/Layer3/N1600.pm
@@ -41,7 +41,7 @@ use SNMP::Info::SONMP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/NetSNMP.pm b/Info/Layer3/NetSNMP.pm
index 730f2bbb..797933ef 100644
--- a/Info/Layer3/NetSNMP.pm
+++ b/Info/Layer3/NetSNMP.pm
@@ -40,7 +40,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Netscreen.pm b/Info/Layer3/Netscreen.pm
index c6e7f3c3..9e91df3b 100644
--- a/Info/Layer3/Netscreen.pm
+++ b/Info/Layer3/Netscreen.pm
@@ -40,7 +40,7 @@ use SNMP::Info::IEEE802dot11;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Nexus.pm b/Info/Layer3/Nexus.pm
index d76e0f5d..584fd914 100644
--- a/Info/Layer3/Nexus.pm
+++ b/Info/Layer3/Nexus.pm
@@ -46,7 +46,7 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 # NOTE: Order creates precedence
 #       Example: v_name exists in Bridge.pm and CiscoVTP.pm
diff --git a/Info/Layer3/PacketFront.pm b/Info/Layer3/PacketFront.pm
index 67fdb0be..437c33d7 100644
--- a/Info/Layer3/PacketFront.pm
+++ b/Info/Layer3/PacketFront.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Passport.pm b/Info/Layer3/Passport.pm
index 2ef1defa..4817bf96 100644
--- a/Info/Layer3/Passport.pm
+++ b/Info/Layer3/Passport.pm
@@ -43,7 +43,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS, %SNMP::Info::RapidCity::MIBS,
diff --git a/Info/Layer3/Pf.pm b/Info/Layer3/Pf.pm
index 58ae19c3..5a8f7445 100644
--- a/Info/Layer3/Pf.pm
+++ b/Info/Layer3/Pf.pm
@@ -41,7 +41,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Pica8.pm b/Info/Layer3/Pica8.pm
index c480a19c..b70897ac 100644
--- a/Info/Layer3/Pica8.pm
+++ b/Info/Layer3/Pica8.pm
@@ -39,7 +39,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/SonicWALL.pm b/Info/Layer3/SonicWALL.pm
index ce98c915..f515e692 100644
--- a/Info/Layer3/SonicWALL.pm
+++ b/Info/Layer3/SonicWALL.pm
@@ -36,7 +36,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS, %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Steelhead.pm b/Info/Layer3/Steelhead.pm
index 85d5e88d..d9a521e0 100644
--- a/Info/Layer3/Steelhead.pm
+++ b/Info/Layer3/Steelhead.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Sun.pm b/Info/Layer3/Sun.pm
index 488f2393..ec6b5b42 100644
--- a/Info/Layer3/Sun.pm
+++ b/Info/Layer3/Sun.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = ( %SNMP::Info::Layer3::MIBS, );
 
diff --git a/Info/Layer3/Tasman.pm b/Info/Layer3/Tasman.pm
index 70107d0a..bcb6bf9a 100644
--- a/Info/Layer3/Tasman.pm
+++ b/Info/Layer3/Tasman.pm
@@ -42,7 +42,7 @@ use SNMP::Info::MAU;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Timetra.pm b/Info/Layer3/Timetra.pm
index 0bd089fd..afe05075 100644
--- a/Info/Layer3/Timetra.pm
+++ b/Info/Layer3/Timetra.pm
@@ -40,7 +40,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = ( %SNMP::Info::Layer3::MIBS, 'TIMETRA-GLOBAL-MIB' => 'timetraReg', );
 
diff --git a/Info/Layer7.pm b/Info/Layer7.pm
index fba2c7f3..c4b6f7bc 100644
--- a/Info/Layer7.pm
+++ b/Info/Layer7.pm
@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::MIBS,
diff --git a/Info/Layer7/APC.pm b/Info/Layer7/APC.pm
index 240821b8..d187b4d5 100644
--- a/Info/Layer7/APC.pm
+++ b/Info/Layer7/APC.pm
@@ -40,7 +40,7 @@ use SNMP::Info::Layer7;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer7::MIBS,
diff --git a/Info/Layer7/Neoteris.pm b/Info/Layer7/Neoteris.pm
index 4c03633d..7899378a 100644
--- a/Info/Layer7/Neoteris.pm
+++ b/Info/Layer7/Neoteris.pm
@@ -38,7 +38,7 @@ use SNMP::Info::Layer7;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer7::MIBS,
diff --git a/Info/Layer7/Netscaler.pm b/Info/Layer7/Netscaler.pm
index a4877069..3c3a9981 100644
--- a/Info/Layer7/Netscaler.pm
+++ b/Info/Layer7/Netscaler.pm
@@ -38,7 +38,7 @@ use SNMP::Info::Layer7;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     %SNMP::Info::Layer7::MIBS,
diff --git a/Info/MAU.pm b/Info/MAU.pm
index 44cb4012..d6131b1f 100644
--- a/Info/MAU.pm
+++ b/Info/MAU.pm
@@ -41,7 +41,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = ( 'MAU-MIB' => 'mauMod', 'IANA-MAU-MIB' => 'dot3MauType' );
 
diff --git a/Info/MRO.pm b/Info/MRO.pm
index a51998fa..1679bf45 100644
--- a/Info/MRO.pm
+++ b/Info/MRO.pm
@@ -4,7 +4,7 @@ use warnings;
 use strict;
 
 use vars qw/$VERSION/;
-$VERSION = '3.20';
+$VERSION = '3.21_001';
  
 use PPI;
 use Class::ISA;
diff --git a/Info/NortelStack.pm b/Info/NortelStack.pm
index 6e77b9a1..d2486f05 100644
--- a/Info/NortelStack.pm
+++ b/Info/NortelStack.pm
@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
 
diff --git a/Info/PowerEthernet.pm b/Info/PowerEthernet.pm
index 950687ff..a09502ca 100644
--- a/Info/PowerEthernet.pm
+++ b/Info/PowerEthernet.pm
@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = ( 'POWER-ETHERNET-MIB' => 'pethPsePortDetectionStatus' );
 
diff --git a/Info/RapidCity.pm b/Info/RapidCity.pm
index b9f82179..d5c0a882 100644
--- a/Info/RapidCity.pm
+++ b/Info/RapidCity.pm
@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     'RAPID-CITY' => 'rapidCity',
diff --git a/Info/SONMP.pm b/Info/SONMP.pm
index 7f772ad5..0be7a7de 100644
--- a/Info/SONMP.pm
+++ b/Info/SONMP.pm
@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.20';
+$VERSION = '3.21_001';
 
 %MIBS = (
     'SYNOPTICS-ROOT-MIB'           => 'synoptics',
diff --git a/MANIFEST b/MANIFEST
index f513eb31..99188a92 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -78,6 +78,7 @@ Info/Layer3/Enterasys.pm
 Info/Layer3/Extreme.pm
 Info/Layer3/F5.pm
 Info/Layer3/Force10.pm
+Info/Layer3/Fortinet.pm
 Info/Layer3/Foundry.pm
 Info/Layer3/H3C.pm
 Info/Layer3/HP9300.pm