diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h
--- a/sys/net80211/ieee80211.h
+++ b/sys/net80211/ieee80211.h
@@ -1266,7 +1266,7 @@
 #define	WPA_CSE_NULL		0x00
 #define	WPA_CSE_WEP40		0x01
 #define	WPA_CSE_TKIP		0x02
-#define	WPA_CSE_CCMP		0x04
+#define	WPA_CSE_CCMP		0x04	/* CCMP 128-bit */
 #define	WPA_CSE_WEP104		0x05
 
 #define	WPA_ASE_NONE		0x00
@@ -1275,6 +1275,7 @@
 
 #define	WPS_OUI_TYPE		0x04
 
+/* 802.11-2016 Table 9.131 - Cipher Suite Selectors */
 #define	RSN_OUI			0xac0f00
 #define	RSN_VERSION		1		/* current supported version */
 
@@ -1282,14 +1283,52 @@
 #define	RSN_CSE_WEP40		0x01
 #define	RSN_CSE_TKIP		0x02
 #define	RSN_CSE_WRAP		0x03
-#define	RSN_CSE_CCMP		0x04
+#define	RSN_CSE_CCMP		0x04		/* CCMP 128 bit */
 #define	RSN_CSE_WEP104		0x05
-
+#define	RSN_CSE_BIP_CMAC_128	0x06
+/* 0x07 - "Group addressed traffic not allowed */
+#define	RSN_CSE_GCMP_128	0x08
+#define	RSN_CSE_GCMP_256	0x09
+#define	RSN_CSE_CCMP_256	0x0a		/* CCMP 256 bit */
+#define	RSN_CSE_BIP_GMAC_128	0x0b
+#define	RSN_CSE_BIP_GMAC_256	0x0c
+#define	RSN_CSE_BIP_CMAC_256	0x0d
+
+/* 802.11-2016 Table 9-133 (AKM suite selectors) */
 #define	RSN_ASE_NONE		0x00
 #define	RSN_ASE_8021X_UNSPEC	0x01
 #define	RSN_ASE_8021X_PSK	0x02
-
-#define	RSN_CAP_PREAUTH		0x01
+#define	RSN_ASE_FT_8021X	0x03		/* SHA-256 */
+#define	RSN_ASE_FT_PSK		0x04		/* SHA-256 */
+#define	RSN_ASE_8021X_UNSPEC_256	0x05
+#define	RSN_ASE_8021X_PSK_256	0x06
+#define	RSN_ASE_8021X_TDLS	0x07
+#define	RSN_ASE_SAE_UNSPEC_256	0x08
+#define	RSN_ASE_FT_SAE_256	0x09
+#define	RSN_ASE_APPEERKEY_256	0x0a
+#define	RSN_ASE_EAP_256		0x0b
+#define	RSN_ASE_EAP_384		0x0c		/* SHA-384 */
+#define	RSN_ASE_FT_8021X_384	0x0d		/* SHA-384 */
+
+/* 802.11-2016 Figure 9-257 (RSN Capabilities) (2 byte field) */
+#define	RSN_CAP_PREAUTH		0x0001
+#define	RSN_CAP_NO_PAIRWISE	0x0002
+#define	RSN_CAP_PTKSA_REPLAY_COUNTER	0x000c	/* 2 bit field */
+#define	RSN_CAP_GTKSA_REPLAY_COUNTER	0x0030	/* 2 bit field */
+#define	RSN_CAP_MFP_REQUIRED	0x0040
+#define	RSN_CAP_MFP_ENABLED	0x0080
+#define	RSN_CAP_JOINT_MULTIBAND_RSNA		0x0100
+#define	RSN_CAP_PEERKEY_ENABLED	0x0200
+#define	RSN_CAP_SPP_AMSDU_CAPABLE	0x0400
+#define	RSN_CAP_SPP_AMSDU_REQUIRED	0x0800
+#define	RSN_CAP_PBAC_CAPABLE	0x1000
+#define	RSN_CAP_EXT_KEYID_CAPABLE	0x0200
+
+/* 802.11-2016 Table 9-134 PTKSA/GTKSA/STKSA replay counters usage */
+#define		RSN_CAP_REPLAY_COUNTER_1_PER	0x00
+#define		RSN_CAP_REPLAY_COUNTER_2_PER	0x01
+#define		RSN_CAP_REPLAY_COUNTER_4_PER	0x02
+#define		RSN_CAP_REPLAY_COUNTER_8_PER	0x03
 
 #define	WME_OUI			0xf25000
 #define	WME_OUI_TYPE		0x02