diff --git a/ChangeLog b/ChangeLog
index 77d20121..1836c95f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ version 3.19
     * Fix Avaya detection lldp_port()
     * Silence uninitialized value warning in L3::Cisco
     * H3C fixes (begemot)
+    * Only use L2::ZyXEL_DSLAM for ZyXEL DSL modules
 
 version 3.18 (2014-07-02)
 
diff --git a/Info.pm b/Info.pm
index c583a0ef..a9d64024 100644
--- a/Info.pm
+++ b/Info.pm
@@ -1529,7 +1529,6 @@ sub device_type {
         171   => 'SNMP::Info::Layer3::Dell',
         207   => 'SNMP::Info::Layer2::Allied',
         674   => 'SNMP::Info::Layer3::Dell',
-        890   => 'SNMP::Info::Layer2::ZyXEL_DSLAM',
         1872  => 'SNMP::Info::Layer3::AlteonAD',
         1916  => 'SNMP::Info::Layer3::Extreme',
         1991  => 'SNMP::Info::Layer3::Foundry',
@@ -1809,6 +1808,9 @@ sub device_type {
         $objtype = 'SNMP::Info::Layer2::HPVC'
             if ( $desc =~ /HP\sVC\s/ );
 
+        $objtype = 'SNMP::Info::Layer2::ZyXEL_DSLAM'
+            if ( $desc =~ /8-port .DSL Module\(Annex .\)/i );
+
         # Generic device classification based upon sysObjectID
         if (    ( $objtype eq 'SNMP::Info::Layer2' )
             and ( defined($id) )