diff --git a/includes/definitions/discovery/zywall.yaml b/includes/definitions/discovery/zywall.yaml
new file mode 100644
index 0000000000..13f4daacab
--- /dev/null
+++ b/includes/definitions/discovery/zywall.yaml
@@ -0,0 +1,20 @@
+mib: ZYXEL-ZYWALL-ZLD-COMMON-MIB
+modules:
+    sensors:
+        pre-cache:
+            data:
+                - oid:
+                    - vpnConnectionName
+        state:
+            data:
+                -
+                    oid: vpnConnectStatus
+                    value: vpnConnectStatus
+                    num_oid: .1.3.6.1.4.1.890.1.6.22.2.4.1.6.
+                    descr: 'vpn : {{ $vpnConnectionName }}'
+                    index: 'vpnIndex.{{ $index }}'
+                    state_name: vpnConnectStatus
+                    states:
+                        - { descr: Disconnected, graph: 0, value: 0, generic: 2 }
+                        - { descr: Connected, graph: 0, value: 1, generic: 0 }
+
diff --git a/includes/discovery/mempools/zywall.inc.php b/includes/discovery/mempools/zywall.inc.php
index 180a6df5ca..0f6d862430 100644
--- a/includes/discovery/mempools/zywall.inc.php
+++ b/includes/discovery/mempools/zywall.inc.php
@@ -17,4 +17,9 @@ if ($device['os'] == 'zywall') {
     if (is_numeric($usage)) {
         discover_mempool($valid_mempool, $device, '0', 'zywall', 'Memory', '1', null, null);
     }
+    
+    $flash = snmp_get($device, '.1.3.6.1.4.1.890.1.15.3.2.6.0', '-Ovq');
+    if (is_numeric($flash)) {
+        discover_mempool($valid_mempool, $device, '1', 'zywall', 'Flash', '1', null, null);
+    }
 }
diff --git a/includes/polling/mempools/zywall.inc.php b/includes/polling/mempools/zywall.inc.php
index b183ddaebf..2fb92b4cc3 100644
--- a/includes/polling/mempools/zywall.inc.php
+++ b/includes/polling/mempools/zywall.inc.php
@@ -11,10 +11,22 @@
  */
 
 d_echo('Zywall');
-$perc = snmp_get($device, ".1.3.6.1.4.1.890.1.6.22.1.2.0", '-OvQ');
-if (is_numeric($perc)) {
-    $mempool['perc'] = $perc;
-    $mempool['used'] = $perc;
-    $mempool['total'] = 100;
-    $mempool['free'] = 100 - $perc;
+if ($mempool['mempool_index'] == 0) {
+    $perc = snmp_get($device, ".1.3.6.1.4.1.890.1.6.22.1.2.0", '-OvQ');
+    if (is_numeric($perc)) {
+        $mempool['perc'] = $perc;
+        $mempool['used'] = $perc;
+        $mempool['total'] = 100;
+        $mempool['free'] = 100 - $perc;
+    }
+}
+
+if ($mempool['mempool_index'] == 1) {
+    $perc = snmp_get($device, ".1.3.6.1.4.1.890.1.15.3.2.6.0", '-OvQ');
+    if (is_numeric($perc)) {
+        $mempool['perc'] = $perc;
+        $mempool['used'] = $perc;
+        $mempool['total'] = 100;
+        $mempool['free'] = 100 - $perc;
+    }
 }
diff --git a/mibs/zyxel/ZYXEL-ES-COMMON b/mibs/zyxel/ZYXEL-ES-COMMON
new file mode 100644
index 0000000000..0aa38ffb4e
--- /dev/null
+++ b/mibs/zyxel/ZYXEL-ES-COMMON
@@ -0,0 +1,424 @@
+-- **********************************************
+-- ZyXEL Communications Corporation
+--
+-- Enterprise Solution MIB definitions
+-- Common MIBs (COMMON)
+--
+-- Julian Wu
+--
+-- Copyright by ZyXEL Communications Corp.
+-- All rights reserved.
+-- **********************************************
+
+ZYXEL-ES-COMMON DEFINITIONS ::= BEGIN
+
+IMPORTS
+
+	MODULE-IDENTITY,
+	OBJECT-IDENTITY,
+	OBJECT-TYPE		FROM SNMPv2-SMI
+
+	OBJECT-GROUP,
+	MODULE-COMPLIANCE	FROM SNMPv2-CONF
+
+	DisplayString	FROM SNMPv2-TC
+	EnabledStatus	FROM  P-BRIDGE-MIB
+
+	esMgmt			FROM ZYXEL-ES-SMI
+	esConformance			FROM ZYXEL-ES-SMI;
+
+esSysInfo MODULE-IDENTITY
+	LAST-UPDATED	"201009200000Z"    
+	ORGANIZATION "Enterprise Solution ZyXEL"     
+	CONTACT-INFO
+		""	   
+	DESCRIPTION
+		"The subtree for system information"
+	::= { esMgmt 1 }
+
+esSysMgmt MODULE-IDENTITY
+	LAST-UPDATED	"201009060000Z" 
+	ORGANIZATION "Enterprise Solution ZyXEL"     
+	CONTACT-INFO
+		""	   
+	DESCRIPTION
+		"The subtree for basic system management"
+	::= { esMgmt 2 }
+
+-- esSysInfo OIDs
+
+SwPlatform ::= TEXTUAL-CONVENTION
+	STATUS		current
+	DESCRIPTION
+		"The indicattion of software platform.
+
+		zynos  : ZyNOS.
+		zld    : ZLD.
+		other  : Other operating system."
+
+	SYNTAX INTEGER {
+		other(1),
+		zynos(2),
+		zld(3)
+	}
+
+
+
+sysSwPlatform OBJECT-TYPE
+	SYNTAX		SwPlatform
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"The software platform information."
+	::= { esSysInfo 1 }
+
+sysSwMajorVersion OBJECT-TYPE
+	SYNTAX		INTEGER
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"The major version of software platform."
+	::= { esSysInfo 2 }
+
+sysSwMinorVersion OBJECT-TYPE
+	SYNTAX		INTEGER
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"The minor version of software platform."
+	::= { esSysInfo 3 }
+
+sysSwModel OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"The device model ID."
+	::= { esSysInfo 4 }
+
+sysSwPatchNumber OBJECT-TYPE
+	SYNTAX		INTEGER
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"The firmeare patch number."
+	::= { esSysInfo 5 }
+
+sysSwVersionString OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"The detail software version."
+	::= { esSysInfo 6 }
+
+sysSwDay OBJECT-TYPE
+	SYNTAX		INTEGER
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"The day of software build date."
+	::= { esSysInfo 7 }
+
+sysSwMonth OBJECT-TYPE
+	SYNTAX		INTEGER
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"The month of software build date."
+	::= { esSysInfo 8 }
+
+sysSwYear OBJECT-TYPE
+	SYNTAX		INTEGER
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"The year of software build date."
+	::= { esSysInfo 9 }
+
+sysProductFamily OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"The product line information."
+	::= { esSysInfo 10 }
+
+sysProductModel OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"The device model name."
+	::= { esSysInfo 11 }
+
+sysProductSerialNumber OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"The searial number of this device."
+	::= { esSysInfo 12 }
+
+sysHwMajorVersion OBJECT-TYPE
+	SYNTAX		INTEGER
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"The major version of hardware platform."
+	::= { esSysInfo 13 }
+
+sysHwMinorVersion OBJECT-TYPE
+	SYNTAX		INTEGER
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"The minor version of hardware platform."
+	::= { esSysInfo 14 }
+	
+sysHwVersionString OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"The detail hardware version."
+	::= { esSysInfo 15 }    
+	
+sysCountryCode OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"System Country."
+	::= { esSysInfo 16 }
+
+-- sysCurrentDateTime is obsoleted. don't use it.
+sysCurrentDateTime OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		obsolete
+	DESCRIPTION
+        	"System current date time."
+	::= { esSysInfo 17 }
+
+-- sysCurrentTime is obsoleted. don't use it.
+sysCurrentTime OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		obsolete
+	DESCRIPTION
+		""
+	::= { esSysInfo 18 }
+
+-- sysActiveSessionNum is only used in NXC5200.
+sysActiveSessionNum OBJECT-TYPE
+	SYNTAX		Integer32
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"The number of active session."
+	::= { esSysInfo 19 }
+
+
+-- esSysMgmt OIDs
+
+MgmtAlarmStatus ::= TEXTUAL-CONVENTION
+	STATUS		current
+	DESCRIPTION
+		""
+	SYNTAX BITS {
+		sysAlarmDetected(0),
+		sysTemperatureError(1),
+		sysFanRPMError(2),
+		sysVoltageRangeError(3)
+	}
+
+sysMgmtReboot OBJECT-TYPE   
+	SYNTAX  INTEGER {  
+		running(0),
+		reboot (1)
+	}
+
+	MAX-ACCESS	read-write
+	STATUS		current
+	DESCRIPTION
+		""
+	::= { esSysMgmt 1 }
+
+sysMgmtConfigSave OBJECT-TYPE
+	SYNTAX  INTEGER {  
+		running(0),
+		save (1)
+	}
+
+	MAX-ACCESS	read-write
+	STATUS		current
+	DESCRIPTION
+		""
+	::= { esSysMgmt 2 }
+
+sysMgmtRestoreDefaultConfig OBJECT-TYPE
+	SYNTAX  INTEGER {  
+		running(0),
+		restore (1)
+	}                       
+	
+	MAX-ACCESS	read-write
+	STATUS		current
+	DESCRIPTION
+		""
+	::= { esSysMgmt 3 }
+
+sysMgmtCPUUsage OBJECT-TYPE
+	SYNTAX		INTEGER (0..100)
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Device CPU usage (%)"
+	::= { esSysMgmt 4 }
+
+sysMgmtMemUsage OBJECT-TYPE
+	SYNTAX		INTEGER (0..100)
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Device memory usage (%)"
+	::= { esSysMgmt 5 }
+
+sysMgmtFlashUsage OBJECT-TYPE
+	SYNTAX		INTEGER (0..100)
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Device flash usage (%)"
+	::= { esSysMgmt 6 }
+
+sysMgmtCPU5SecUsage OBJECT-TYPE
+	SYNTAX		INTEGER (0..100)
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Average CPU usage in 5 seconds. (%)"
+	::= { esSysMgmt 7 }
+
+sysMgmtCPU1MinUsage OBJECT-TYPE
+	SYNTAX		INTEGER (0..100)
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Average CPU usage in 1 minute. (%)"
+	::= { esSysMgmt 8 }
+
+sysMgmtCPU5MinUsage OBJECT-TYPE
+	SYNTAX		INTEGER (0..100)
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Average CPU usage in 5 minutes. (%)"
+	::= { esSysMgmt 9 }
+
+sysMgmtBootupConfigIndex OBJECT-TYPE
+	SYNTAX		INTEGER (0..100)
+	MAX-ACCESS	read-write
+	STATUS		current
+	DESCRIPTION
+		""
+	::= { esSysMgmt 10 }
+
+
+sysMgmtBootupImageIndex OBJECT-TYPE
+	SYNTAX		INTEGER (0..100)
+	MAX-ACCESS	read-write
+	STATUS		current
+	DESCRIPTION
+		""
+	::= { esSysMgmt 11 }
+
+-- sysMgmtAlarmStatus is obsoleted, don't use it.
+sysMgmtAlarmStatus OBJECT-TYPE
+	SYNTAX		MgmtAlarmStatus
+	MAX-ACCESS	read-only
+	STATUS		obsolete
+	DESCRIPTION
+		""
+	::= { esSysMgmt 12 }
+
+-- sysMgmtVLANControl is used only for NWA1K series and NWA1300-NJ.
+sysMgmtVLANControl OBJECT-TYPE
+    SYNTAX		EnabledStatus
+    MAX-ACCESS	read-write
+    STATUS		deprecated
+    DESCRIPTION
+        "Enable/Disable management vlan."
+    ::= { esSysMgmt 13 }
+
+-- sysMgmtVLANID is used only for NWA1K series and NWA1300-NJ.
+sysMgmtVLANID OBJECT-TYPE
+	SYNTAX		INTEGER (0..4094)
+	MAX-ACCESS	read-write
+	STATUS		deprecated
+	DESCRIPTION
+		"Management vlan id."
+	::= { esSysMgmt 14 }
+
+-- sys8021QControl is used only for NWA1K series.
+sys8021QControl OBJECT-TYPE
+    SYNTAX		EnabledStatus
+    MAX-ACCESS  read-write
+    STATUS      deprecated
+    DESCRIPTION
+        "System vlan status."
+    ::= { esSysMgmt 15 }
+
+
+-- compliance statements for ES-COMMON
+
+esBasicCompliances	OBJECT IDENTIFIER ::= { esConformance 1 }
+esBasicGroups		OBJECT IDENTIFIER ::= { esConformance 2 }
+
+esBasicCompliance MODULE-COMPLIANCE
+	STATUS		current
+	DESCRIPTION
+		"The compliance statement for ES common MIB"
+	MODULE -- this module
+		MANDATORY-GROUPS {
+			esSysInfoGroup,
+			esSysMgmtGroup
+		}
+	::= { esBasicCompliances 1 }
+
+esSysInfoGroup OBJECT-GROUP
+	OBJECTS {
+		sysSwPlatform,
+		sysSwMajorVersion,
+		sysSwMinorVersion,
+		sysSwModel,
+		sysSwPatchNumber,
+		sysSwVersionString,
+		sysSwDay,
+		sysSwMonth,
+		sysSwYear,
+		sysProductFamily,
+		sysProductModel,
+		sysProductSerialNumber
+	}
+	STATUS		current
+	DESCRIPTION
+		""
+	::= { esBasicGroups 1 }
+
+esSysMgmtGroup OBJECT-GROUP
+	OBJECTS {
+		sysMgmtReboot,
+		sysMgmtConfigSave,
+		sysMgmtRestoreDefaultConfig,
+		sysMgmtCPUUsage,
+		sysMgmtMemUsage
+	}
+	STATUS		current
+	DESCRIPTION
+		""
+	::= { esBasicGroups 2 }
+
+END
+
diff --git a/mibs/zyxel/ZYXEL-ES-SMI b/mibs/zyxel/ZYXEL-ES-SMI
new file mode 100644
index 0000000000..eb79e0f0d1
--- /dev/null
+++ b/mibs/zyxel/ZYXEL-ES-SMI
@@ -0,0 +1,80 @@
+-- **********************************************
+-- ZyXEL Communications Corporation
+--
+-- Enterprise Solution MIB definitions
+-- Structure of Management Information (SMI)
+--
+-- Julian Wu
+--
+-- Copyright by ZyXEL Communications Corp.
+-- All rights reserved.
+-- **********************************************
+
+ZYXEL-ES-SMI DEFINITIONS ::= BEGIN
+
+IMPORTS
+
+	MODULE-IDENTITY,
+	OBJECT-IDENTITY,
+	enterprises		FROM SNMPv2-SMI;
+		
+
+
+zyxel		OBJECT IDENTIFIER ::= { enterprises 890 }
+products	OBJECT IDENTIFIER ::= { zyxel 1 }
+                                                  
+                                                                                                                                                                         
+                                                  
+enterpriseSolution MODULE-IDENTITY 
+	LAST-UPDATED	"201009200000Z"
+	ORGANIZATION "Enterprise Solution ZyXEL"     
+	CONTACT-INFO
+		""	     
+	DESCRIPTION
+		"The Structure of Management Information
+		for Enterprise Solution ZyXEL"
+	::= { products 15 }  
+	            
+	
+esAgentCapability	OBJECT-IDENTITY
+	STATUS		current
+	DESCRIPTION
+		"The root object identifier for
+		AGENT-CAPABILITIES values"
+	::= { enterpriseSolution 1 }
+
+esConformance		OBJECT-IDENTITY
+	STATUS		current
+	DESCRIPTION
+		"The root object identifier for
+		MODULE-COMPLIANCE values"
+	::= { enterpriseSolution 2 }
+                                            
+esMgmt			OBJECT-IDENTITY
+	STATUS		current
+	DESCRIPTION
+		"The main subtree for MIBs"
+	::= { enterpriseSolution 3 }
+
+esProductSpecific           OBJECT-IDENTITY
+	STATUS		current
+	DESCRIPTION
+		"The root of product-specific OID subtrees"
+	::= { enterpriseSolution 4 }
+
+esPartnerProducts           OBJECT-IDENTITY
+	STATUS		current
+	DESCRIPTION
+		"The root for MIBs from partner products.
+		Followed by partner sysObjectID values"
+	::= { enterpriseSolution 5 }                                            
+
+tenders	OBJECT IDENTIFIER ::= { esProductSpecific 4 }
+
+zyxelNAS           OBJECT-IDENTITY
+	STATUS		current
+	DESCRIPTION
+		"The root object identifier for zyxelNAS"
+	::= { tenders 5 }
+
+END
diff --git a/mibs/zyxel/ZYXEL-MIB b/mibs/zyxel/ZYXEL-MIB
index d0dd41ccfb..d86267d7ac 100644
--- a/mibs/zyxel/ZYXEL-MIB
+++ b/mibs/zyxel/ZYXEL-MIB
@@ -1,312 +1,276 @@
--- ZyXEL Communications Corporation
--- Private Enterprise MIB definition
-
--- This file describes the ZyXEL Communications Corporation Enterprise MIB.
--- It contains ZyXEL products OIDs, and common managed objects.
-
--- $Log: zyxel.mib $
--- Revision 1.2  2007/07/20 09:28:18  jacky
--- Revision 1.1  2006/08/28 05:32:50  kenny
--- Initial revision
--- Revision 1.4  2006/06/08 09:18:13  niceguy
--- Revision 1.3  2006/05/15 03:00:36  niceguy
--- Revision 1.2  2006/03/07 06:37:09  niceguy
--- Revision 1.1  2005/11/23 12:47:47  niceguy
--- Initial revision
--- Revision 1.2  2005/08/24 09:57:57  niceguy
--- Revision 1.20  2005/06/17 05:33:47  jackho
--- Revision 1.19  2005/06/09 07:29:05  jennyhsu
--- Revision 1.18  2005/05/04 01:15:38  jennyhsu
--- Revision 1.17  2005/03/07 11:22:32  Admin
--- change IES1248-71 and IES1248-73 OID
--- Revision 1.16  2004/06/08 10:13:33  jenny
---
--- Revision 1.15  2004/05/20 08:24:00  jennyhsu
--- Revision 1.14  2004/05/19 10:47:37  jennyhsu
--- add system OID for new products
--- Revision 1.13  2004/03/01 07:06:56  jennyhsu
--- add object alc1124-71
--- Revision 1.12  2004/02/25 08:41:34  jennyhsu
--- add vlc1124 and ves1124
--- Revision 1.11  2003/09/10 00:58:52  jennyhsu
--- Add product OID for ves1416
--- Revision 1.10  2003/05/27 08:12:05  jennyhsu
--- Add object accessSwitchCommonATM
--- Revision 1.9  2003/05/07 06:46:20  jennyhsu
--- Remove ves2000
--- Revision 1.8  2003/03/28 01:36:38  jennyhsu
--- Add OID for ves1316, vlc1316 and ves2000
--- Revision 1.7  2003/03/10 02:54:32  jennyhsu
--- Add ether switch products
--- Revision 1.6  2002/11/12 07:41:52  jennyhsu
--- Revision 1.5  2002/09/02 11:48:40  jennyhsu
--- Revision 1.4  2002/01/10 05:10:37  jennyhsu
--- Revision 1.3  2001/10/26 02:50:02  jennyhsu
--- Revision 1.2  2001/10/03 09:03:20  jennyhsu
--- Revision 1.1  2001/08/25 06:01:16  jennyhsu
--- Initial revision
-
-    ZYXEL-MIB DEFINITIONS ::= BEGIN
-
-    IMPORTS
-	enterprises		FROM RFC1155-SMI;
-
-
-
-	zyxel			OBJECT IDENTIFIER ::= { enterprises 890 }
-
-	products		OBJECT IDENTIFIER ::= { zyxel 1 }
-
-	prestige 		OBJECT IDENTIFIER ::= { products 2 }
-	rack			OBJECT IDENTIFIER ::= { products 3 }
-	dslam			OBJECT IDENTIFIER ::= { products 4 }
-	accessSwitch  		OBJECT IDENTIFIER ::= { products 5 }
-	zywall			OBJECT IDENTIFIER ::= { products 6 }
-	atmEncryptor		OBJECT IDENTIFIER ::= { products 7 }
-	serviceGateway  	OBJECT IDENTIFIER ::= { products 8 }
-	wimax		  	OBJECT IDENTIFIER ::= { products 9 }
-
-	-- Prestige products
-
-	prestigeCommon		OBJECT IDENTIFIER ::= { prestige 1 }
-	p200Series		OBJECT IDENTIFIER ::= { prestige 2 }
-	p300Series		OBJECT IDENTIFIER ::= { prestige 3 }
-	p400Series		OBJECT IDENTIFIER ::= { prestige 4 }
-	p500Series		OBJECT IDENTIFIER ::= { prestige 5 }
-	p600Series		OBJECT IDENTIFIER ::= { prestige 6 }
-	p641			OBJECT IDENTIFIER ::= { p600Series 1 }
-	p642			OBJECT IDENTIFIER ::= { p600Series 2 }
-	p643			OBJECT IDENTIFIER ::= { p600Series 3 }
-	p700Series		OBJECT IDENTIFIER ::= { prestige 7 }
-	p794ra			OBJECT IDENTIFIER ::= { p700Series 1 }
-	p794rb			OBJECT IDENTIFIER ::= { p700Series 2 }
-	p800Series		OBJECT IDENTIFIER ::= { prestige 8 }
-	p900Series		OBJECT IDENTIFIER ::= { prestige 9 }
-	p2X00Series		OBJECT IDENTIFIER ::= { prestige 10 }
-
-	-- ISDN TA and Router P200 series
-	p202h			OBJECT IDENTIFIER ::= { p200Series 1 }
-	p202hPlus		OBJECT IDENTIFIER ::= { p200Series 2 }
-
-
-
-	-- IP Sharing Gateway P300 series
-	p304			OBJECT IDENTIFIER ::= { p300Series 1 }
-	p310			OBJECT IDENTIFIER ::= { p300Series 2 }
-	p314			OBJECT IDENTIFIER ::= { p300Series 3 }
-	p314Plus		OBJECT IDENTIFIER ::= { p300Series 4 }
-	p324			OBJECT IDENTIFIER ::= { p300Series 5 }
-	
-	p641			OBJECT IDENTIFIER ::= { p600Series 1 }
-	p642			OBJECT IDENTIFIER ::= { p600Series 2 }
-	p643			OBJECT IDENTIFIER ::= { p600Series 3 }	
-	p645ra1			OBJECT IDENTIFIER ::= { p600Series 4 }	
-	p650r31			OBJECT IDENTIFIER ::= { p600Series 5 }	
-	p650r11			OBJECT IDENTIFIER ::= { p600Series 6 }	
-	p650h11			OBJECT IDENTIFIER ::= { p600Series 7 }	
-	p650hw11		OBJECT IDENTIFIER ::= { p600Series 8 }	
-	p650r13			OBJECT IDENTIFIER ::= { p600Series 9 }	
-	p650me11		OBJECT IDENTIFIER ::= { p600Series 10 }	
-	p650me13		OBJECT IDENTIFIER ::= { p600Series 11 }	
-	p652r11			OBJECT IDENTIFIER ::= { p600Series 12 }	
-	p652r13			OBJECT IDENTIFIER ::= { p600Series 13 }	
-	p650r33			OBJECT IDENTIFIER ::= { p600Series 14 }
-	p650hw31		OBJECT IDENTIFIER ::= { p600Series 15 }	
-	p650hw33		OBJECT IDENTIFIER ::= { p600Series 16 }	
-	p623ra1			OBJECT IDENTIFIER ::= { p600Series 17 }	
-	p650h37			OBJECT IDENTIFIER ::= { p600Series 18 }	
-	p652hw31		OBJECT IDENTIFIER ::= { p600Series 19 }	
-	p652hw33		OBJECT IDENTIFIER ::= { p600Series 20 }	
-	p654ra-a1		OBJECT IDENTIFIER ::= { p600Series 21 }	
-	p650r-e1		OBJECT IDENTIFIER ::= { p600Series 22 }	
-	p650r-e3		OBJECT IDENTIFIER ::= { p600Series 23 }	
-	p650r-e7		OBJECT IDENTIFIER ::= { p600Series 24 }	
-	p650h-e7		OBJECT IDENTIFIER ::= { p600Series 25 }	
-	p652hw37		OBJECT IDENTIFIER ::= { p600Series 26 }	
-	p650h-e1		OBJECT IDENTIFIER ::= { p600Series 27 }	
-	p623r-t1		OBJECT IDENTIFIER ::= { p600Series 28 }	
-	p623r-t3		OBJECT IDENTIFIER ::= { p600Series 29 }	
-	p623r-t7		OBJECT IDENTIFIER ::= { p600Series 30 }	
-	p653hwi-11		OBJECT IDENTIFIER ::= { p600Series 31 }	
-	p653hwi-13		OBJECT IDENTIFIER ::= { p600Series 32 }	
-	p653hwi-17		OBJECT IDENTIFIER ::= { p600Series 33 }	
-	p660hw-61		OBJECT IDENTIFIER ::= { p600Series 34 }	
-	p650r-t3		OBJECT IDENTIFIER ::= { p600Series 35 }	
-	p660hw-63		OBJECT IDENTIFIER ::= { p600Series 36 }	
-	p660hw-67		OBJECT IDENTIFIER ::= { p600Series 37 }	
-	p660w-61		OBJECT IDENTIFIER ::= { p600Series 38 }	
-	p660w-63		OBJECT IDENTIFIER ::= { p600Series 39 }	
-	p660w-67		OBJECT IDENTIFIER ::= { p600Series 40 }	
-	p660r-61		OBJECT IDENTIFIER ::= { p600Series 41 }	
-	p660r-63		OBJECT IDENTIFIER ::= { p600Series 42 }	
-	p660r-67		OBJECT IDENTIFIER ::= { p600Series 43 }	
-	p650r-t1		OBJECT IDENTIFIER ::= { p600Series 44 }	
-	p662w-61		OBJECT IDENTIFIER ::= { p600Series 45 }	
-	p662w-63		OBJECT IDENTIFIER ::= { p600Series 46 }	
-	p662w-67		OBJECT IDENTIFIER ::= { p600Series 47 }	
-	p660h-61		OBJECT IDENTIFIER ::= { p600Series 48 }	
-	p660h-63		OBJECT IDENTIFIER ::= { p600Series 49 }	
-	p660h-67		OBJECT IDENTIFIER ::= { p600Series 50 }	
-	p660r-67C		OBJECT IDENTIFIER ::= { p600Series 51 }	
-	p660r-61C		OBJECT IDENTIFIER ::= { p600Series 52 }	
-	p660hw-13		OBJECT IDENTIFIER ::= { p600Series 53 }	
-	p660ru-t1		OBJECT IDENTIFIER ::= { p600Series 54 }	
-	p660ru-t3		OBJECT IDENTIFIER ::= { p600Series 55 }	
---	p660ru-t7		OBJECT IDENTIFIER ::= { p600Series 55 }	the same as p660ru-t3
-		
-	p794ra			OBJECT IDENTIFIER ::= { p700Series 1 }
-	p794rb			OBJECT IDENTIFIER ::= { p700Series 2 }	
-	p742			OBJECT IDENTIFIER ::= { p700Series 3 }	
-	p791r			OBJECT IDENTIFIER ::= { p700Series 4 }	
-	p792r			OBJECT IDENTIFIER ::= { p700Series 5 }	
-	
-	p861h			OBJECT IDENTIFIER ::= { p800Series 1 }	
-	p861hw			OBJECT IDENTIFIER ::= { p800Series 2 }
-	
-	-- VoIP p2X00 series
-	p2602hw-61		OBJECT IDENTIFIER ::= { p2X00Series 1 }
-    p2602hw-63		OBJECT IDENTIFIER ::= { p2X00Series 2 }
-    p2602hw-67		OBJECT IDENTIFIER ::= { p2X00Series 3 }
-    p2602hwl-61		OBJECT IDENTIFIER ::= { p2X00Series 4 }
-    p2602hwl-63		OBJECT IDENTIFIER ::= { p2X00Series 5 }
-    p2602hwl-67		OBJECT IDENTIFIER ::= { p2X00Series 6 }	
-    p2002-obm		OBJECT IDENTIFIER ::= { p2X00Series 7 }	
-    p2002l-obm		OBJECT IDENTIFIER ::= { p2X00Series 8 }	
-    p2002l-aol		OBJECT IDENTIFIER ::= { p2X00Series 9 }	
-    p2302r-obm		OBJECT IDENTIFIER ::= { p2X00Series 10 }	
-    p2602r-61		OBJECT IDENTIFIER ::= { p2X00Series 11 }	
-	
-
-
-
-
-	-- Access Switch products
-	accessSwitchCommon	OBJECT IDENTIFIER ::= { accessSwitch 1 }
-	aes100			OBJECT IDENTIFIER ::= { accessSwitch 2 }
-	pes100			OBJECT IDENTIFIER ::= { accessSwitch 3 }
-	ves1012			OBJECT IDENTIFIER ::= { accessSwitch 4 }
-	sesSeries		OBJECT IDENTIFIER ::= { accessSwitch 5 }
-	sesSeriesCommon		OBJECT IDENTIFIER ::= { sesSeries 1 }
-	sam1008			OBJECT IDENTIFIER ::= { sesSeries 2 }
-	ses1024			OBJECT IDENTIFIER ::= { sesSeries 3 }
-	slc1024			OBJECT IDENTIFIER ::= { sesSeries 4 }
-	slc1224-22		OBJECT IDENTIFIER ::= { sesSeries 5 }
-	sam1216-22 		OBJECT IDENTIFIER ::= { sesSeries 6 }
-	ies708-22a-stuc	OBJECT IDENTIFIER ::= { sesSeries 7 }
-	ies708-22a-stur	OBJECT IDENTIFIER ::= { sesSeries 8 }
-	p1600			OBJECT IDENTIFIER ::= { accessSwitch 6 }
-	p1400			OBJECT IDENTIFIER ::= { accessSwitch 7 }
-
-	esSeries		OBJECT IDENTIFIER ::= { accessSwitch 8 }
-	esSeriesCommon		OBJECT IDENTIFIER ::= { esSeries 1 }
-	ees1024af		OBJECT IDENTIFIER ::= { esSeries 2 }
-	es2008			OBJECT IDENTIFIER ::= { esSeries 3 }
-	es2008-gtp		OBJECT IDENTIFIER ::= { esSeries 4 }
-	es2008-sc		OBJECT IDENTIFIER ::= { esSeries 5 }
-	es2008-sc30		OBJECT IDENTIFIER ::= { esSeries 6 }
-	es3024			OBJECT IDENTIFIER ::= { esSeries 7 }
-	es4024			OBJECT IDENTIFIER ::= { esSeries 8 }
-	es2024			OBJECT IDENTIFIER ::= { esSeries 9 }
-	gs3012			OBJECT IDENTIFIER ::= { esSeries 10 }
-	gs3012f			OBJECT IDENTIFIER ::= { esSeries 11 }
-	es3124			OBJECT IDENTIFIER ::= { esSeries 12 }
-	gs4024			OBJECT IDENTIFIER ::= { esSeries 13 }
-	es3124pwr		OBJECT IDENTIFIER ::= { esSeries 14 }
-	gs2024			OBJECT IDENTIFIER ::= { esSeries 15 }
-	es2024a			OBJECT IDENTIFIER ::= { esSeries 16 }
-	es3148			OBJECT IDENTIFIER ::= { esSeries 17 }
-	es2108			OBJECT IDENTIFIER ::= { esSeries 18 }
-	es2108g			OBJECT IDENTIFIER ::= { esSeries 19 }
-	gs4012f			OBJECT IDENTIFIER ::= { esSeries 20 }
-	es2108pwr		OBJECT IDENTIFIER ::= { esSeries 21 }
-	es2108lc		OBJECT IDENTIFIER ::= { esSeries 22 }
-	es2048			OBJECT IDENTIFIER ::= { esSeries 23 }
-	es4124			OBJECT IDENTIFIER ::= { esSeries 24 }
---	gs3012			OBJECT IDENTIFIER ::= { esSeries 25 }
-	es3124-4f		OBJECT IDENTIFIER ::= { esSeries 26 }
-
-	aes100-1		OBJECT IDENTIFIER ::= { accessSwitch 9 }
-	pes1014			OBJECT IDENTIFIER ::= { accessSwitch 10 }
-
-	aesSeries		OBJECT IDENTIFIER ::= { accessSwitch 11 }
-	aesSeriesCommon		OBJECT IDENTIFIER ::= { aesSeries 1 }
-	aes1024			OBJECT IDENTIFIER ::= { aesSeries 2 }
-	alc1024-61		OBJECT IDENTIFIER ::= { aesSeries 3 }
-	aam1008-63		OBJECT IDENTIFIER ::= { aesSeries 4 }
-	alc1024-63		OBJECT IDENTIFIER ::= { aesSeries 5 }
-	aam1008-61		OBJECT IDENTIFIER ::= { aesSeries 6 }
-	alc1224-71		OBJECT IDENTIFIER ::= { aesSeries 7 }
-	ies1248-71		OBJECT IDENTIFIER ::= { aesSeries 9 }
-	ies1248-73		OBJECT IDENTIFIER ::= { aesSeries 10 }
-	aam1212-51		OBJECT IDENTIFIER ::= { aesSeries 11 }
-	aam1212-53		OBJECT IDENTIFIER ::= { aesSeries 12 }
-	ies1248-51		OBJECT IDENTIFIER ::= { aesSeries 13 }
-	ies1248-53		OBJECT IDENTIFIER ::= { aesSeries 14 }
-	alc1224-51		OBJECT IDENTIFIER ::= { aesSeries 15 }
-	alc1224-53		OBJECT IDENTIFIER ::= { aesSeries 16 }
-
-	vesSeries		OBJECT IDENTIFIER ::= { accessSwitch 12 }
-	vesSeriesCommon		OBJECT IDENTIFIER ::= { vesSeries 1 }
-	ves1008			OBJECT IDENTIFIER ::= { vesSeries 2 }
---	vmb2024			OBJECT IDENTIFIER ::= { vesSeries 3 }
-	ves1024			OBJECT IDENTIFIER ::= { vesSeries 4 }
-	vlc1012			OBJECT IDENTIFIER ::= { vesSeries 5 }
-	ves1316			OBJECT IDENTIFIER ::= { vesSeries 6 }
-	ves1416			OBJECT IDENTIFIER ::= { vesSeries 7 }
-	vlc1124			OBJECT IDENTIFIER ::= { vesSeries 8 }
-	ves1124			OBJECT IDENTIFIER ::= { vesSeries 9 }
-	ves1616f34		OBJECT IDENTIFIER ::= { vesSeries 10 }
-	ves1616f44		OBJECT IDENTIFIER ::= { vesSeries 11 }
-	ves1624f44		OBJECT IDENTIFIER ::= { vesSeries 12 }
-
-	iesSeries		OBJECT IDENTIFIER ::= { accessSwitch 13 }
-	iesSeriesCommon		OBJECT IDENTIFIER ::= { iesSeries 1 }
-	ies2000			OBJECT IDENTIFIER ::= { iesSeries 2 }
-	ies3000			OBJECT IDENTIFIER ::= { iesSeries 3 }
-	ies5000			OBJECT IDENTIFIER ::= { iesSeries 5 }
-	ies5005			OBJECT IDENTIFIER ::= { iesSeries 7 }
-	ies6000			OBJECT IDENTIFIER ::= { iesSeries 8 }
-
-	accessSwitchCommonATM	OBJECT IDENTIFIER ::= { accessSwitch 14 }
-
-	-- DSLAM products
-	dslamCommon             OBJECT IDENTIFIER ::= { dslam 1 }
-
-
-	-- Service Gateway products
-	serviceGWCommon			OBJECT IDENTIFIER ::= { serviceGateway 1 }
-	vsg1000				OBJECT IDENTIFIER ::= { serviceGateway 2 }
-	vsg1200				OBJECT IDENTIFIER ::= { serviceGateway 3 }
-	vsg1200v2			OBJECT IDENTIFIER ::= { serviceGateway 4 }
-
-	ponSeries		OBJECT IDENTIFIER ::= { accessSwitch 15 }
-	olt1308			OBJECT IDENTIFIER ::= { ponSeries 1 }
-	lt20h			OBJECT IDENTIFIER ::= { ponSeries 2 }
-
-	-- ZyWALL series
-	zywallCommon           	OBJECT IDENTIFIER ::= { zywall 1 }
-	zywall1		      	OBJECT IDENTIFIER ::= { zywall 2 }
-	zywall2		        OBJECT IDENTIFIER ::= { zywall 3 }
-	zywall2w	      	OBJECT IDENTIFIER ::= { zywall 4 }
-	zywall10	       	OBJECT IDENTIFIER ::= { zywall 5 }
-	zywall10ii		OBJECT IDENTIFIER ::= { zywall 6 }
-	zywall10w		OBJECT IDENTIFIER ::= { zywall 7 }
-	zywall50	      	OBJECT IDENTIFIER ::= { zywall 8 }
-	zywall100	      	OBJECT IDENTIFIER ::= { zywall 9 }
-	zywall200	       	OBJECT IDENTIFIER ::= { zywall 10 }
-	zywallidp10           	OBJECT IDENTIFIER ::= { zywall 11 }
-	zywall5           	OBJECT IDENTIFIER ::= { zywall 12 }
-	zywall30w           	OBJECT IDENTIFIER ::= { zywall 13 }
-	zywall35           	OBJECT IDENTIFIER ::= { zywall 14 }
-	zywall70           	OBJECT IDENTIFIER ::= { zywall 15 }
-	zywall1000           	OBJECT IDENTIFIER ::= { zywall 16 }
-	zywallCHT1           	OBJECT IDENTIFIER ::= { zywall 17 }
-	zywallM70           	OBJECT IDENTIFIER ::= { zywall 18 }
-	zywallP1           	OBJECT IDENTIFIER ::= { zywall 19 }
-	zywallP2           	OBJECT IDENTIFIER ::= { zywall 20 }
-	zywallM110         	OBJECT IDENTIFIER ::= { zywall 21 }
-
-	-- ZyWALL ZLD series
-	zywallZLDCommon		OBJECT IDENTIFIER ::= { zywall 22 }
-
-END
+-- ZyXEL Communications Corporation
+-- Private Enterprise MIB definition 
+  
+-- This file describes the ZyXEL Communications Corporation Enterprise MIB.
+-- It contains ZyXEL products OIDs, and common managed objects.
+
+-- $Log: zywall.mib,v $
+-- Revision 1.1  2006/07/28 04:17:47  saxont
+-- support zld module(CPU,MEM,VPNthroughput)
+-- 
+-- Revision 1.36  2004/11/01 11:21:07  cchiang 
+-- add p2602r-61 
+-- Revision 1.35  2004/10/26 06:59:23  cchiang 
+-- Add p660ru-t3/p660ru-t7 
+-- Revision 1.34  2004/10/14 02:17:23  cchiang 
+-- Add p2302r-obm 
+-- Revision 1.33  2004/10/12 09:44:20  cchiang 
+-- Add p2002-obm, p2002l-obm and p2002l-aol series. 
+-- Revision 1.32  2004/10/01 08:56:36  cchiang 
+-- Add p660hw-13 
+-- Revision 1.31  2004/09/29 12:31:24  cchiang 
+-- Add p660r-61C 
+-- Revision 1.30  2004/09/23 11:06:14  cchiang 
+-- Add p660r-67C 
+-- Revision 1.29  2004/06/03 07:41:04  cchiang 
+-- Add p202hPlus 
+-- Revision 1.28  2004/05/28 01:28:21  cchiang 
+-- zywallidp10 
+-- Revision 1.27  2004/04/26 09:53:45  cchiang 
+-- Add p2602 series 
+-- Revision 1.26  2004/04/14 08:26:42  cchiang 
+-- Add P861h, P861HW 
+-- Revision 1.25  2004/02/24 05:57:54  cchiang 
+-- Add P660h series 
+-- Revision 1.24  2004/02/05 01:21:30  cchiang 
+-- Add P662HW-61/63/76 
+-- Revision 1.23  2004/01/15 01:48:52  cchiang 
+-- Modified p650m-t3 to p650r-t3 and add p650r-t1 
+-- Revision 1.22  2004/01/06 03:36:53  cchiang 
+-- Add AR7 series 
+-- Revision 1.21  2003/11/27 03:11:55  cchiang 
+-- add P650M-T3 
+-- Revision 1.20  2003/10/21 06:19:12  cchiang 
+-- Add p660hw-61 
+-- Revision 1.19  2003/10/03 04:00:05  cchiang 
+-- Add p653HWI-1x series 
+-- Revision 1.18  2003/08/11 07:31:21  cchiang 
+-- Change P645R-T1/T3/T7 to P623R-T1/T3/T7 
+-- Revision 1.17  2003/07/18 10:18:48  cchiang 
+-- Add p650h-e1,p645r-t1,p645r-t3,p645r-t7 
+-- Revision 1.16  2003/06/12 12:14:57  cchiang 
+-- Add p652hw37 
+-- Revision 1.15  2003/06/02 06:29:04  cchiang 
+-- Add p654ra-a1, p645r-e1, p645r-e3, p645r-e7, p645h-e7 
+-- Revision 1.14  2003/04/08 02:21:14  cchiang 
+-- Add p652hw31,p652hw33 
+-- Revision 1.13  2003/02/27 06:31:04  cchiang 
+-- Add p650h37 
+-- Revision 1.12  2003/02/13 06:37:35  cchiang 
+-- Add P623ra1 
+-- Revision 1.11  2003/01/08 11:18:35  cchiang 
+-- Add zywall200 
+-- Revision 1.10  2003/01/06 05:52:58  cchiang 
+-- Add p791r, 792r and p202h 
+-- Revision 1.9  2002/12/30 07:30:17  cchiang 
+-- Add p650hw31 and p650hw33 
+-- Revision 1.8  2002/11/05 08:09:13  cchiang 
+-- Add p650r33 object identifier 
+-- Revision 1.7  2002/10/24 03:02:13  cchiang 
+-- Add IP sharing and ZyWall series 
+-- Revision 1.6  2002/09/05 00:46:21  cchiang 
+-- Add p652r11 and p652r13 
+-- Revision 1.5  2002/09/03 07:54:00  cchiang 
+-- Revision 1.4  2002/06/26 02:16:16  cchiang 
+-- Add p650r11, p650h11, p650hw11 
+-- Revision 1.3  2002/06/12 02:29:30  cchiang 
+-- Add p645ra1 ans p650r31 oid 
+-- Revision 1.2  2002/06/05 04:07:42  cchiang 
+-- Add p742 OID. 
+-- Revision 1.1  2001/11/22 10:51:27  jennyhsu 
+-- Initial revision 
+-- Revision 1.3  2001/10/26 02:50:02  jennyhsu 
+-- Revision 1.2  2001/10/03 09:03:20  jennyhsu 
+-- Revision 1.1  2001/08/25 06:01:16  jennyhsu 
+-- Initial revision 
+
+    ZYXEL-MIB DEFINITIONS ::= BEGIN
+
+    IMPORTS
+	enterprises		FROM RFC1155-SMI;
+	
+	
+
+	zyxel			OBJECT IDENTIFIER ::= { enterprises 890 }
+	
+	products		OBJECT IDENTIFIER ::= { zyxel 1 }
+	
+	prestige 		OBJECT IDENTIFIER ::= { products 2 }
+	rack			OBJECT IDENTIFIER ::= { products 3 }
+	dslam			OBJECT IDENTIFIER ::= { products 4 }
+	accessSwitch  	OBJECT IDENTIFIER ::= { products 5 }
+	zywall			OBJECT IDENTIFIER ::= { products 6 }
+	
+	-- Prestige products
+
+	prestigeCommon		OBJECT IDENTIFIER ::= { prestige 1 }
+	p200Series		OBJECT IDENTIFIER ::= { prestige 2 }
+	p300Series		OBJECT IDENTIFIER ::= { prestige 3 }
+	p400Series		OBJECT IDENTIFIER ::= { prestige 4 }
+	p500Series		OBJECT IDENTIFIER ::= { prestige 5 }
+	p600Series		OBJECT IDENTIFIER ::= { prestige 6 }
+	p700Series		OBJECT IDENTIFIER ::= { prestige 7 }
+	p800Series		OBJECT IDENTIFIER ::= { prestige 8 }
+	p900Series		OBJECT IDENTIFIER ::= { prestige 9 }
+	p2X00Series		OBJECT IDENTIFIER ::= { prestige 10 }
+
+
+
+	-- ISDN TA and Router P200 series
+	p202h			OBJECT IDENTIFIER ::= { p200Series 1 }
+	p202hPlus		OBJECT IDENTIFIER ::= { p200Series 2 }
+
+
+
+	-- IP Sharing Gateway P300 series
+	p304			OBJECT IDENTIFIER ::= { p300Series 1 }
+	p310			OBJECT IDENTIFIER ::= { p300Series 2 }
+	p314			OBJECT IDENTIFIER ::= { p300Series 3 }
+	p314Plus		OBJECT IDENTIFIER ::= { p300Series 4 }
+	p324			OBJECT IDENTIFIER ::= { p300Series 5 }
+	
+	p641			OBJECT IDENTIFIER ::= { p600Series 1 }
+	p642			OBJECT IDENTIFIER ::= { p600Series 2 }
+	p643			OBJECT IDENTIFIER ::= { p600Series 3 }	
+	p645ra1			OBJECT IDENTIFIER ::= { p600Series 4 }	
+	p650r31			OBJECT IDENTIFIER ::= { p600Series 5 }	
+	p650r11			OBJECT IDENTIFIER ::= { p600Series 6 }	
+	p650h11			OBJECT IDENTIFIER ::= { p600Series 7 }	
+	p650hw11		OBJECT IDENTIFIER ::= { p600Series 8 }	
+	p650r13			OBJECT IDENTIFIER ::= { p600Series 9 }	
+	p650me11		OBJECT IDENTIFIER ::= { p600Series 10 }	
+	p650me13		OBJECT IDENTIFIER ::= { p600Series 11 }	
+	p652r11			OBJECT IDENTIFIER ::= { p600Series 12 }	
+	p652r13			OBJECT IDENTIFIER ::= { p600Series 13 }	
+	p650r33			OBJECT IDENTIFIER ::= { p600Series 14 }
+	p650hw31		OBJECT IDENTIFIER ::= { p600Series 15 }	
+	p650hw33		OBJECT IDENTIFIER ::= { p600Series 16 }	
+	p623ra1			OBJECT IDENTIFIER ::= { p600Series 17 }	
+	p650h37			OBJECT IDENTIFIER ::= { p600Series 18 }	
+	p652hw31		OBJECT IDENTIFIER ::= { p600Series 19 }	
+	p652hw33		OBJECT IDENTIFIER ::= { p600Series 20 }	
+	p654ra-a1		OBJECT IDENTIFIER ::= { p600Series 21 }	
+	p650r-e1		OBJECT IDENTIFIER ::= { p600Series 22 }	
+	p650r-e3		OBJECT IDENTIFIER ::= { p600Series 23 }	
+	p650r-e7		OBJECT IDENTIFIER ::= { p600Series 24 }	
+	p650h-e7		OBJECT IDENTIFIER ::= { p600Series 25 }	
+	p652hw37		OBJECT IDENTIFIER ::= { p600Series 26 }	
+	p650h-e1		OBJECT IDENTIFIER ::= { p600Series 27 }	
+	p623r-t1		OBJECT IDENTIFIER ::= { p600Series 28 }	
+	p623r-t3		OBJECT IDENTIFIER ::= { p600Series 29 }	
+	p623r-t7		OBJECT IDENTIFIER ::= { p600Series 30 }	
+	p653hwi-11		OBJECT IDENTIFIER ::= { p600Series 31 }	
+	p653hwi-13		OBJECT IDENTIFIER ::= { p600Series 32 }	
+	p653hwi-17		OBJECT IDENTIFIER ::= { p600Series 33 }	
+	p660hw-61		OBJECT IDENTIFIER ::= { p600Series 34 }	
+	p650r-t3		OBJECT IDENTIFIER ::= { p600Series 35 }	
+	p660hw-63		OBJECT IDENTIFIER ::= { p600Series 36 }	
+	p660hw-67		OBJECT IDENTIFIER ::= { p600Series 37 }	
+	p660w-61		OBJECT IDENTIFIER ::= { p600Series 38 }	
+	p660w-63		OBJECT IDENTIFIER ::= { p600Series 39 }	
+	p660w-67		OBJECT IDENTIFIER ::= { p600Series 40 }	
+	p660r-61		OBJECT IDENTIFIER ::= { p600Series 41 }	
+	p660r-63		OBJECT IDENTIFIER ::= { p600Series 42 }	
+	p660r-67		OBJECT IDENTIFIER ::= { p600Series 43 }	
+	p650r-t1		OBJECT IDENTIFIER ::= { p600Series 44 }	
+	p662w-61		OBJECT IDENTIFIER ::= { p600Series 45 }	
+	p662w-63		OBJECT IDENTIFIER ::= { p600Series 46 }	
+	p662w-67		OBJECT IDENTIFIER ::= { p600Series 47 }	
+	p660h-61		OBJECT IDENTIFIER ::= { p600Series 48 }	
+	p660h-63		OBJECT IDENTIFIER ::= { p600Series 49 }	
+	p660h-67		OBJECT IDENTIFIER ::= { p600Series 50 }	
+	p660r-67C		OBJECT IDENTIFIER ::= { p600Series 51 }	
+	p660r-61C		OBJECT IDENTIFIER ::= { p600Series 52 }	
+	p660hw-13		OBJECT IDENTIFIER ::= { p600Series 53 }	
+	p660ru-t1		OBJECT IDENTIFIER ::= { p600Series 54 }	
+	p660ru-t3		OBJECT IDENTIFIER ::= { p600Series 55 }	
+--	p660ru-t7		OBJECT IDENTIFIER ::= { p600Series 55 }	the same as p660ru-t3
+		
+	p794ra			OBJECT IDENTIFIER ::= { p700Series 1 }
+	p794rb			OBJECT IDENTIFIER ::= { p700Series 2 }	
+	p742			OBJECT IDENTIFIER ::= { p700Series 3 }	
+	p791r			OBJECT IDENTIFIER ::= { p700Series 4 }	
+	p792r			OBJECT IDENTIFIER ::= { p700Series 5 }	
+	
+	p861h			OBJECT IDENTIFIER ::= { p800Series 1 }	
+	p861hw			OBJECT IDENTIFIER ::= { p800Series 2 }
+	
+	-- VoIP p2X00 series
+	p2602hw-61		OBJECT IDENTIFIER ::= { p2X00Series 1 }
+    p2602hw-63		OBJECT IDENTIFIER ::= { p2X00Series 2 }
+    p2602hw-67		OBJECT IDENTIFIER ::= { p2X00Series 3 }
+    p2602hwl-61		OBJECT IDENTIFIER ::= { p2X00Series 4 }
+    p2602hwl-63		OBJECT IDENTIFIER ::= { p2X00Series 5 }
+    p2602hwl-67		OBJECT IDENTIFIER ::= { p2X00Series 6 }	
+    p2002-obm		OBJECT IDENTIFIER ::= { p2X00Series 7 }	
+    p2002l-obm		OBJECT IDENTIFIER ::= { p2X00Series 8 }	
+    p2002l-aol		OBJECT IDENTIFIER ::= { p2X00Series 9 }	
+    p2302r-obm		OBJECT IDENTIFIER ::= { p2X00Series 10 }	
+    p2602r-61		OBJECT IDENTIFIER ::= { p2X00Series 11 }	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	-- Access Switch products
+	accessSwitchCommon	OBJECT IDENTIFIER ::= { accessSwitch 1 }
+	aes100			OBJECT IDENTIFIER ::= { accessSwitch 2 }
+	pes100			OBJECT IDENTIFIER ::= { accessSwitch 3 }
+	ves1012			OBJECT IDENTIFIER ::= { accessSwitch 4 }
+	sesSeries		OBJECT IDENTIFIER ::= { accessSwitch 5 }
+	sesSeriesCommon		OBJECT IDENTIFIER ::= { sesSeries 1 }
+	sam1008			OBJECT IDENTIFIER ::= { sesSeries 2 }
+	ses1024			OBJECT IDENTIFIER ::= { sesSeries 3 }
+	slc1024			OBJECT IDENTIFIER ::= { sesSeries 4 }
+	p1600			OBJECT IDENTIFIER ::= { accessSwitch 6 }
+	p1400			OBJECT IDENTIFIER ::= { accessSwitch 7 }
+	ees1024			OBJECT IDENTIFIER ::= { accessSwitch 8 }
+	aes100-1		OBJECT IDENTIFIER ::= { accessSwitch 9 }
+	pes1014			OBJECT IDENTIFIER ::= { accessSwitch 10 }	
+	aesSeries		OBJECT IDENTIFIER ::= { accessSwitch 11 }
+	aesSeriesCommon		OBJECT IDENTIFIER ::= { aesSeries 1 }
+	aes1024			OBJECT IDENTIFIER ::= { aesSeries 2 }
+	alc1024			OBJECT IDENTIFIER ::= { aesSeries 3 }
+	aam1008			OBJECT IDENTIFIER ::= { aesSeries 4 }		
+	vesSeries		OBJECT IDENTIFIER ::= { accessSwitch 12 }
+	vesSeriesCommon		OBJECT IDENTIFIER ::= { vesSeries 1 }
+	ves1008			OBJECT IDENTIFIER ::= { vesSeries 2 }
+	vmb2024			OBJECT IDENTIFIER ::= { vesSeries 3 }			
+	ies2000			OBJECT IDENTIFIER ::= { accessSwitch 13 }
+	ies3000			OBJECT IDENTIFIER ::= { accessSwitch 14 }
+	
+	-- DSLAM products
+	dslamCommon             OBJECT IDENTIFIER ::= { dslam 1 }
+		
+	-- ZyWALL series
+	zywallCommon           	OBJECT IDENTIFIER ::= { zywall 1 }
+	zywall1		      	OBJECT IDENTIFIER ::= { zywall 2 }
+	zywall2		        OBJECT IDENTIFIER ::= { zywall 3 }
+	zywall2w	      	OBJECT IDENTIFIER ::= { zywall 4 }
+	zywall10	       	OBJECT IDENTIFIER ::= { zywall 5 }
+	zywall10ii		OBJECT IDENTIFIER ::= { zywall 6 }
+	zywall10w		OBJECT IDENTIFIER ::= { zywall 7 }
+	zywall50	      	OBJECT IDENTIFIER ::= { zywall 8 }
+	zywall100	      	OBJECT IDENTIFIER ::= { zywall 9 }
+	zywall200	       	OBJECT IDENTIFIER ::= { zywall 10 }
+	zywallidp10           	OBJECT IDENTIFIER ::= { zywall 11 }
+	zywall5           	OBJECT IDENTIFIER ::= { zywall 12 }
+	zywall30w           	OBJECT IDENTIFIER ::= { zywall 13 }
+	zywall35           	OBJECT IDENTIFIER ::= { zywall 14 }
+	zywall70           	OBJECT IDENTIFIER ::= { zywall 15 }
+	zywall1000           	OBJECT IDENTIFIER ::= { zywall 16 }
+	zywallCHT1           	OBJECT IDENTIFIER ::= { zywall 17 }
+	zywallM70           	OBJECT IDENTIFIER ::= { zywall 18 }
+	zywallP1           	OBJECT IDENTIFIER ::= { zywall 19 }
+	zywallP2           	OBJECT IDENTIFIER ::= { zywall 20 }
+	zywallM110         	OBJECT IDENTIFIER ::= { zywall 21 }
+
+	-- ZyWALL ZLD series
+	zywallZLDCommon		OBJECT IDENTIFIER ::= { zywall 22 }
+
+END
+
diff --git a/mibs/zyxel/ZYXEL-ZYWALL-ZLD-COMMON-MIB b/mibs/zyxel/ZYXEL-ZYWALL-ZLD-COMMON-MIB
new file mode 100644
index 0000000000..5972b42964
--- /dev/null
+++ b/mibs/zyxel/ZYXEL-ZYWALL-ZLD-COMMON-MIB
@@ -0,0 +1,266 @@
+ZYXEL-ZYWALL-ZLD-COMMON-MIB DEFINITIONS ::= BEGIN
+	IMPORTS
+		enterprises
+			FROM RFC1155-SMI
+		OBJECT-TYPE
+			FROM RFC-1212
+		DisplayString
+			FROM RFC1213-MIB
+		TRAP-TYPE
+			FROM RFC-1215
+		NOTIFICATION-TYPE
+			FROM SNMPv2-SMI
+		zywallZLDCommon
+			FROM ZYXEL-MIB;
+
+	-- ZyWALL ZLD Key Groups
+	zldSystem		OBJECT IDENTIFIER ::= { zywallZLDCommon 1 }
+	zldIpSecVPN		OBJECT IDENTIFIER ::= { zywallZLDCommon 2 }
+
+	-- ZyWALL ZLD System
+	sysCPUUsage OBJECT-TYPE
+		SYNTAX  INTEGER
+		MAX-ACCESS  read-only
+		STATUS  mandatory
+		DESCRIPTION
+			"Device CPU load."
+		::= { zldSystem 1 }
+
+	sysRAMUsage OBJECT-TYPE
+		SYNTAX  INTEGER
+		MAX-ACCESS  read-only
+		STATUS  mandatory
+		DESCRIPTION
+			"Device RAM Usage."
+		::= { zldSystem 2 }
+
+	sysCPU5SecUsage OBJECT-TYPE
+		SYNTAX  INTEGER
+		MAX-ACCESS  read-only
+		STATUS  mandatory
+		DESCRIPTION
+			"Average of past 5 secs cpu load."
+		::= { zldSystem 3 }
+		
+	sysCPU1MinUsage OBJECT-TYPE
+		SYNTAX  INTEGER
+		MAX-ACCESS  read-only
+		STATUS  mandatory
+		DESCRIPTION
+			"Average of past 1 min cpu load."
+		::= { zldSystem 4 }
+		
+	sysCPU5MinUsage OBJECT-TYPE
+		SYNTAX  INTEGER
+		MAX-ACCESS  read-only
+		STATUS  mandatory
+		DESCRIPTION
+			"Average of past 5 min cpu load."
+		::= { zldSystem 5 }
+		
+	sysSessionNum OBJECT-TYPE
+		SYNTAX  INTEGER
+		MAX-ACCESS  read-only
+		STATUS  mandatory
+		DESCRIPTION
+			"Device Session Num."
+		::= { zldSystem 6 }
+
+	sysFLASHUsage OBJECT-TYPE
+		SYNTAX  INTEGER
+		MAX-ACCESS  read-only
+		STATUS  mandatory
+		DESCRIPTION
+			"Device FLASH Usage."
+		::= { zldSystem 7 }
+		
+	-- ZyWALL ZLD IpSec VPN
+	vpnIpSecTotalThroughput	OBJECT-TYPE
+		SYNTAX	INTEGER
+		MAX-ACCESS	read-only
+		STATUS	mandatory
+		DESCRIPTION
+			"The VPN total throughput(B/s)."
+		::= { zldIpSecVPN 1 }
+
+	vpnTunnelTable OBJECT-TYPE
+		SYNTAX  SEQUENCE OF VPNTunnelEntry
+		MAX-ACCESS  not-accessible
+		STATUS  current
+		DESCRIPTION
+			"A list of VPN tunnel entries. The number depends on product 
+			definition."
+		::= { zldIpSecVPN 2 }
+	
+	vpnTunnelEntry OBJECT-TYPE
+		SYNTAX  VPNTunnelEntry
+		MAX-ACCESS  not-accessible
+		STATUS  current
+		DESCRIPTION
+        		"An entry containing comment the information for on a particular 
+                         configured VPN tunnel."
+		INDEX   { vpnTunnelIndex }
+		::= { vpnTunnelTable 1 }
+	
+	VPNTunnelEntry ::= SEQUENCE {
+		vpnTunnelName 	DisplayString,
+		vpnIKEName  	DisplayString,
+		vpnTunnelSPI	DisplayString
+		}
+	
+	vpnTunnelName OBJECT-TYPE
+		SYNTAX	DisplayString
+		MAX-ACCESS  read-only
+		STATUS  current
+		DESCRIPTION
+     			"The name of VPN tunnel."
+		::= { vpnTunnelEntry 1 }
+
+	vpnIKEName OBJECT-TYPE
+		SYNTAX	DisplayString
+		MAX-ACCESS  read-only
+		STATUS  current
+		DESCRIPTION
+			"The name of IKE tunnel."
+		::= { vpnTunnelEntry 2 }
+
+	vpnTunnelSPI OBJECT-TYPE
+		SYNTAX 	DisplayString
+		MAX-ACCESS  read-only
+		STATUS  current
+		DESCRIPTION
+			"The security parameter index associated with a VPN tunnel."
+                ::= { vpnTunnelEntry 3 }
+
+	vpnTunnelDisconnected NOTIFICATION-TYPE
+		OBJECTS {vpnTunnelName, vpnIKEName, 
+                         vpnTunnelSPI }
+		STATUS	current
+		DESCRIPTION
+			"The trap indicates that the specified tunnel is disconnected."
+		::= { zldIpSecVPN 3 }
+
+	vpnStatus OBJECT-TYPE
+		SYNTAX  SEQUENCE OF vpnStatusEntry
+		MAX-ACCESS  not-accessible
+		STATUS  current
+		DESCRIPTION
+			"A list of VPN tunnel entries. The number depends on product 
+			definition."
+		::= { zldIpSecVPN 4 }
+
+	vpnStatusEntry OBJECT-TYPE
+		SYNTAX  VPNStatusEntry
+		MAX-ACCESS  not-accessible
+		STATUS  current
+		DESCRIPTION
+        		"An entry containing comment the information for on a particular 
+                         configured VPN tunnel."
+		INDEX   { vpnIndex }
+		::= { vpnStatus 1 }
+	
+	VPNStatusEntry ::= SEQUENCE {
+		vpnIndex			Integer,
+		vpnConnectionName 	DisplayString,
+		vpnGateway  		DisplayString,
+		vpnIPVersion		DisplayString,
+		vpnActiveStatus 	Integer,
+		vpnConnectStatus	Integer
+		}
+
+	vpnIndex OBJECT-TYPE
+		SYNTAX	Integer
+		MAX-ACCESS  read-only
+		STATUS  current
+		DESCRIPTION
+     			"The table index of VPN connection."
+		::= { vpnStatusEntry 1 }
+
+	vpnConnectionName OBJECT-TYPE
+		SYNTAX	DisplayString
+		MAX-ACCESS  read-only
+		STATUS  current
+		DESCRIPTION
+     			"The name of VPN connection."
+		::= { vpnStatusEntry 2 }
+
+	vpnGateway OBJECT-TYPE
+		SYNTAX	DisplayString
+		MAX-ACCESS  read-only
+		STATUS  current
+		DESCRIPTION
+     			"The name of VPN gateway."
+		::= { vpnStatusEntry 3 }
+
+	vpnIPVersion OBJECT-TYPE
+		SYNTAX	DisplayString
+		MAX-ACCESS  read-only
+		STATUS  current
+		DESCRIPTION
+     			"IP version of the VPN connection: either IPv4 or IPv6."
+		::= { vpnStatusEntry 4 }
+
+	vpnActiveStatus OBJECT-TYPE
+		SYNTAX	Integer {
+		          Inactive(0),
+		          Active(1)
+		        }
+		MAX-ACCESS  read-only
+		STATUS  current
+		DESCRIPTION
+     			"Activation status of VPN connection."
+		::= { vpnStatusEntry 5 }
+
+	vpnConnectStatus OBJECT-TYPE
+		SYNTAX	Integer {
+		          Disconnected(0),
+		          Connected(1)
+		        }
+		MAX-ACCESS  read-only
+		STATUS  current
+		DESCRIPTION
+     			"Connection status of VPN connection."
+		::= { vpnStatusEntry 6 }
+
+	vpnConnectionCounter OBJECT-TYPE
+		SYNTAX  Integer
+		MAX-ACCESS  not-accessible
+		STATUS  current
+		DESCRIPTION
+			"A list of VPN connection counters." 
+		::= { zldIpSecVPN 5 }
+
+	vpnConnectionTotal OBJECT-TYPE
+		SYNTAX	Counter
+		MAX-ACCESS  read-only
+		STATUS  current
+		DESCRIPTION
+     			"Total number of VPN connection configured."
+		::= { vpnConnectionCounter 1 }
+
+	vpnConnectionActive OBJECT-TYPE
+		SYNTAX	Counter
+		MAX-ACCESS  read-only
+		STATUS  current
+		DESCRIPTION
+     			"Number of activated VPN connection."
+		::= { vpnConnectionCounter 2 }
+
+	vpnConnectionConnected OBJECT-TYPE
+		SYNTAX	Counter
+		MAX-ACCESS  read-only
+		STATUS  current
+		DESCRIPTION
+     			"Number of connected VPN connection."
+		::= { vpnConnectionCounter 3 }
+
+	vpnConnectionDisconnected OBJECT-TYPE
+		SYNTAX	Counter
+		MAX-ACCESS  read-only
+		STATUS  current
+		DESCRIPTION
+     			"Number of disconnected VPN connection. The
+     			value is equal to vpnConnectionActive minus
+     			vpnConnectionConnected."
+		::= { vpnConnectionCounter 4 }
+END