diff --git a/userspace/snmpd/WR-SWITCH-MIB.txt b/userspace/snmpd/WR-SWITCH-MIB.txt
index d09029da6455ada1d296b52792614aa4bbf9a5ab..2468d2e0f71b418f1ff2040d2ec9975816a5d8e4 100644
--- a/userspace/snmpd/WR-SWITCH-MIB.txt
+++ b/userspace/snmpd/WR-SWITCH-MIB.txt
@@ -1442,7 +1442,7 @@ WrsPortStatusEntry ::=
         wrsPortStatusIndex       Unsigned32,
         wrsPortStatusPortName    DisplayString,
         wrsPortStatusLink        INTEGER,
-        wrsPortStatusMode        INTEGER,
+        wrsPortStatusConfiguredMode INTEGER,
         wrsPortStatusLocked      INTEGER,
         wrsPortStatusPeer        OCTET STRING,
         wrsPortStatusSfpVN       DisplayString,
@@ -1481,7 +1481,7 @@ wrsPortStatusLink OBJECT-TYPE
             "Whether the link is up or down"
     ::= { wrsPortStatusEntry 3 }
 
-wrsPortStatusMode OBJECT-TYPE
+wrsPortStatusConfiguredMode OBJECT-TYPE
     SYNTAX         INTEGER {
                         unknown(0),
                         master(1),
@@ -1492,7 +1492,7 @@ wrsPortStatusMode OBJECT-TYPE
     MAX-ACCESS     read-only
     STATUS         current
     DESCRIPTION
-            "Whether the port is master or slave"
+            "Whether the port is configured as master, slave, non-wr or auto"
     ::= { wrsPortStatusEntry 4 }
 
 wrsPortStatusLocked OBJECT-TYPE
diff --git a/userspace/snmpd/wrsPortStatusTable.c b/userspace/snmpd/wrsPortStatusTable.c
index c635f679ff76888d71f5d3409042bda02f5d637a..8cd693f128154e972637f22b5b0036eda5c05f0f 100644
--- a/userspace/snmpd/wrsPortStatusTable.c
+++ b/userspace/snmpd/wrsPortStatusTable.c
@@ -55,9 +55,13 @@ time_t wrsPortStatusTable_data_fill(unsigned int *n_rows)
 					wrsPortStatusTable_array[i].port_name);
 			/* No need to copy all ports structures, only what
 			 * we're interested in.
-			 * Keep value 0 for Not available */
+			 * Keep value 0 for Not available
+			 * values defined as WRS_PORT_STATUS_LINK_*
+			*/
 			wrsPortStatusTable_array[i].link_up =
 					1 + state_up(port_state->state);
+			 /* values defined as
+			  * WRS_PORT_STATUS_CONFIGURED_MODE_* */
 			wrsPortStatusTable_array[i].port_mode =
 							port_state->mode;
 			if (port_state->state == HAL_PORT_STATE_DISABLED) {
diff --git a/userspace/snmpd/wrsPortStatusTable.h b/userspace/snmpd/wrsPortStatusTable.h
index 17020a56f7211c9553a945b8286ac9a017ba6fcb..9cd2991fbe975d31ed3c038ebe85ca13cd3971d7 100644
--- a/userspace/snmpd/wrsPortStatusTable.h
+++ b/userspace/snmpd/wrsPortStatusTable.h
@@ -8,6 +8,15 @@
 #define WRS_PORT_STATUS_SFP_ERROR_SFP_ERROR 2	/* error */
 #define WRS_PORT_STATUS_SFP_ERROR_PORT_DOWN 3	/* ok */
 
+#define WRS_PORT_STATUS_LINK_DOWN 1
+#define WRS_PORT_STATUS_LINK_UP 2
+
+#define WRS_PORT_STATUS_CONFIGURED_MODE_MASTER 1
+#define WRS_PORT_STATUS_CONFIGURED_MODE_SLAVE 2
+#define WRS_PORT_STATUS_CONFIGURED_MODE_NON_WR 3
+#define WRS_PORT_STATUS_CONFIGURED_MODE_AUTO 4
+
+
 struct wrsPortStatusTable_s {
 	uint32_t index;		/* not reported, index fields has to be marked
 				 * as not-accessible in MIB */