diff --git a/ChangeLog b/ChangeLog
index f86b0074..94fcb063 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,17 +3,22 @@ SNMP::Info - Friendly OO-style interface to Network devices using SNMP.
 version 2.07 ()
 
     [NEW FEATURES]
+
     * Basic support for APC UPS devices
     * [2993691] Support for SonicWALL devices in new class L3::SonicWALL (phishphreek)
     * [2996795] Support for Kentrox devices in new class L2::Kentrox (phishphreek)
+
+    [ENHANCEMENTS]
+
     * [3085411] Activate L3 properties for Netgear GSM7224v2 (phishphreek)
     * [3085413] SNMP OIDs for Netgear Serial and OS Ver (phishphreek)
     * [3286549] Dell LLDP Support (Nico Giefing)
-    * [3297786] LLDP INDEX munged to ignore TimeMark component (David Baldwin)
 
     [BUG FIXES]
 
     * [2988163] Detect Juniper SSG firewalls as Layer3::Netscreen (R. Kerr)
+    * [3297786] LLDP INDEX munged to ignore TimeMark component (David Baldwin)
+    * [3317739] Fix for Baystack without POE on stack member 1 (David Baldwin)
 
 version 2.06 (2011-09-28)
 
diff --git a/Info/Layer2/Baystack.pm b/Info/Layer2/Baystack.pm
index e83b91c1..62937685 100644
--- a/Info/Layer2/Baystack.pm
+++ b/Info/Layer2/Baystack.pm
@@ -452,6 +452,23 @@ sub e_vendor {
     return $stack->SUPER::e_vendor($partial) || $stack->ns_e_vendor($partial);
 }
 
+# fix for stack of switches without POE on module 1
+# https://sourceforge.net/tracker/?func=detail&aid=3317739&group_id=70362&atid=527529
+sub peth_port_ifindex {
+    my $stack = shift;
+    my $partial = shift;
+
+    my %peth_port_ifindex = ();
+    my $poe_port_st = $stack->peth_port_status($partial);
+    my $if_index = $stack->interfaces($partial);
+
+    foreach my $i (keys %$if_index) {
+        next unless defined $poe_port_st->{$if_index->{$i}};
+        $peth_port_ifindex{$if_index->{$i}} = $i;
+    }
+    return \%peth_port_ifindex;
+}
+
 1;
 
 __END__