diff --git a/doc/capwap_cisco.txt b/doc/capwap_cisco.txt
index 331cd451..388454fe 100644
--- a/doc/capwap_cisco.txt
+++ b/doc/capwap_cisco.txt
@@ -168,6 +168,12 @@ AP = RAD = WTP
 
    Same as element type 28 specified in RFC 5412 (LWAPP)
  
+51. Cisco Broadcast SSID Mode
+    0               
+    0 1 2 3 4 5 6 7 
+   +-+-+-+-+-+-+-+-+
+   |     Mode      |
+   +-+-+-+-+-+-+-+-+
 
 
 
@@ -232,6 +238,15 @@ AP = RAD = WTP
        0=DHCP  
     Reserved: (?)
 
+88.  Cisco Airspace Capability
+
+      0                   1
+      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
+     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+     |   Radio ID    |   Capapab     |
+     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
 
 91.  Cisco AC Name with Index
 
@@ -543,7 +558,14 @@ Vendor spec CAPWAP | Vedor spec LWAPP  | Vendor specific LWAPP data
 	01 = Telnet/SSH Username and Password
 	02 = 802.1x Supplicant Credentials
 
+19. Manager IP Addr
+    0                   1                   2                   3
+    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |  IPv4 Addr                                                    |                       
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 
 
+	
 
 
 21. Radio Module Info (?) (LWAPP 104)
diff --git a/src/cw/capwap_cisco.h b/src/cw/capwap_cisco.h
index 1c8c92a7..f20d0f21 100644
--- a/src/cw/capwap_cisco.h
+++ b/src/cw/capwap_cisco.h
@@ -58,6 +58,7 @@
 
 #define CW_CISCO_CERTIFICATE			LW_ELEM_CERTIFICATE			/* 44 */
 #define CW_CISCO_WTP_BOARD_DATA			LW_ELEM_WTP_BOARD_DATA			/* 50 */
+#define CW_CISCO_BCAST_SSID_MODE		LW_BCAST_SSID_MODE
 #define CW_CISCO_AP_MODE_AND_TYPE		LW_ELEM_80211_WTP_MODE_AND_TYPE		/* 54 */
 #define CW_CISCO_AP_QOS				LW_ELEM_QOS				/* 57 */
 
@@ -67,6 +68,7 @@
 #define CW_CISCO_AP_STATIC_IP_ADDR		83
 #define CW_CISCO_SIG_PAYLOAD			84
 #define CW_CISCO_SIG_TOGGLE			87
+#define CW_CISCO_AIRSPACE_CAPABILITY		88
 
 #define CW_CISCO_AC_NAME_WITH_INDEX		91
 #define CW_CISCO_SPAM_DOMAIN_SECRET		96
diff --git a/src/cw/cw_cisco_id_to_str.c b/src/cw/cw_cisco_id_to_str.c
index 003f29dd..10a5b8a0 100644
--- a/src/cw/cw_cisco_id_to_str.c
+++ b/src/cw/cw_cisco_id_to_str.c
@@ -142,6 +142,11 @@ const char * cw_cisco_id_to_str(int elem_id)
 
 		case CW_CISCO_AP_CORE_DUMP:
 			return "AP Core Dump";
+
+		case CW_CISCO_AIRSPACE_CAPABILITY:
+			return "Airspace Capability";	
+		case CW_CISCO_BCAST_SSID_MODE:
+			return "Broadcast SSID Mode";
 		
 		default:
 			return "Unknown";
diff --git a/src/cw/lw_cisco_id_to_str.c b/src/cw/lw_cisco_id_to_str.c
index 13a0ffe3..726f72bf 100644
--- a/src/cw/lw_cisco_id_to_str.c
+++ b/src/cw/lw_cisco_id_to_str.c
@@ -44,6 +44,9 @@ const char * lw_cisco_id_to_str(int elem_id)
 		case LW_CISCO_RAD_EXTENDED_CONFIG:
 			return "RAD Extended Config";
 
+		case LW_CISCO_MANAGER_IP_ADDR:
+			return "MAnager IP Address";
+
 		default: 
 			return "Unknown";
 
diff --git a/src/cw/lwapp.h b/src/cw/lwapp.h
index dfbcfa8f..bb6795e3 100644
--- a/src/cw/lwapp.h
+++ b/src/cw/lwapp.h
@@ -150,6 +150,7 @@
 
 #define LW_ELEM_CERTIFICATE				44
 #define LW_ELEM_WTP_BOARD_DATA				50
+#define LW_BCAST_SSID_MODE				51
 #define LW_ELEM_WTP_MODE_AND_TYPE			54
 #define LW_ELEM_QOS					57
 
diff --git a/src/cw/lwapp_cisco.h b/src/cw/lwapp_cisco.h
index fb7a2131..266e5e8d 100644
--- a/src/cw/lwapp_cisco.h
+++ b/src/cw/lwapp_cisco.h
@@ -29,6 +29,7 @@
  */
 
 #define LW_CISCO_AP_USERNAME_PASSWORD		18
+#define LW_CISCO_MANAGER_IP_ADDR		19
 #define LW_CISCO_RADIO_MODULE_INFO		21
 #define LW_CISCO_AC_IP_ADDR_WITH_INDEX		32
 #define LW_CISCO_AP_ETHERNET_PORT_SUBTYPE	34