diff --git a/ChangeLog b/ChangeLog
index c03488f9..2b5a0348 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@ version 3.28 (TBD)
   [ENHANCEMENTS]
 
   * Add Layer3::Huawei class for Huawei Quidway switches
+  * Modified generic Layer3::Cisco class: use community based indexing if
+    the device returns a value for vtpVersion
 
 version 3.27 (2015-05-05)
 
diff --git a/Info/Layer3/Cisco.pm b/Info/Layer3/Cisco.pm
index 2e4cfe95..8446f5b7 100644
--- a/Info/Layer3/Cisco.pm
+++ b/Info/Layer3/Cisco.pm
@@ -136,6 +136,13 @@ sub i_vlan {
     return $i_vlan;
 }
 
+sub cisco_comm_indexing { 
+    my $cisco = shift;
+    # If we get a VTP version, it's *extremely* likely that the device needs community based indexing
+    my $vtp = $cisco->vtp_version() || '0';
+    return ($vtp ne '0');
+}
+
 1;
 __END__
 
@@ -237,6 +244,11 @@ These are methods that return scalar value from SNMP
 
 (C<cEigrpAsRouterId>)
 
+=item $switch->cisco_comm_indexing()
+
+Returns 1 when the device is likely to need vlan indexing.
+Determined by checking C<vtpVersion>.
+
 =back
 
 =head2 Global Methods imported from SNMP::Info::CiscoVTP