diff --git a/lib/SNMP/Info.pm b/lib/SNMP/Info.pm
index df595515..3124e44c 100644
--- a/lib/SNMP/Info.pm
+++ b/lib/SNMP/Info.pm
@@ -3056,7 +3056,9 @@ the SNMP::Info methods.
     'name'         => 'sysName',
     'location'     => 'sysLocation',
     'layers'       => 'sysServices',
+    # IF-MIB
     'ports'        => 'ifNumber',
+    # IP-MIB
     'ipforwarding' => 'ipForwarding',
 );
 
@@ -3074,7 +3076,9 @@ ALTEON-TS-PHYSICAL-MIB::agPortCurCfgPortName.
 =cut
 
 %FUNCS = (
+    # IF-MIB::IfEntry
     'interfaces' => 'ifIndex',
+    # IF-MIB::IfEntry
     'i_name'     => 'ifName',
 
     # IF-MIB::IfEntry
@@ -3104,13 +3108,13 @@ ALTEON-TS-PHYSICAL-MIB::agPortCurCfgPortName.
     # IF-MIB::IfStackTable
     'i_stack_status'    => 'ifStackStatus',
 
-    # IP Address Table
+    # IP::MIB::ipAddrTable (deprecated IPv4 address table)
     'ip_index'     => 'ipAdEntIfIndex',
     'ip_table'     => 'ipAdEntAddr',
     'ip_netmask'   => 'ipAdEntNetMask',
     'ip_broadcast' => 'ipAdEntBcastAddr',
 
-    # ifXTable - Extension Table
+    # IF-MIB::ifXTable - Extension Table
     'i_speed_high'       => 'ifHighSpeed',
     'i_pkts_multi_in'    => 'ifInMulticastPkts',
     'i_pkts_multi_out'   => 'ifOutMulticastPkts',
@@ -3126,7 +3130,7 @@ ALTEON-TS-PHYSICAL-MIB::agPortCurCfgPortName.
     'i_pkts_bcast_out64' => 'ifHCOutBroadcastPkts',
     'i_alias'            => 'ifAlias',
 
-    # IP Routing Table
+    # RFC-1213::ipRoute (deprecated Table IP Routing Table)
     'ipr_route' => 'ipRouteDest',
     'ipr_if'    => 'ipRouteIfIndex',
     'ipr_1'     => 'ipRouteMetric1',
@@ -3157,7 +3161,13 @@ $info->init() will throw an exception if a MIB does not load.
 
 %MIBS = (
 
-    # The "main" MIBs are automagically loaded in Net-SNMP now.
+    # Include these here for cases where the Net-SNMP default MIB list has
+    # been overridden during the compliation of the local Net-SNMP library.
+    # These cover the globals and funcs defined in this file.
+    'SNMPv2-MIB'  => 'sysObjectID',
+    'RFC1213-MIB' => 'ipRouteIfIndex',
+    'IP-MIB'      => 'ipAdEntAddr',
+    'IF-MIB'      => 'ifIndex',
 );
 
 =item %MUNGE