diff --git a/src/capwap/action.h b/src/capwap/action.h
index e7a489f1..6aa50e45 100644
--- a/src/capwap/action.h
+++ b/src/capwap/action.h
@@ -128,7 +128,9 @@ enum capwapmodes {
 	/** Zyxel */
 	CW_MODE_ZYXEL,
 	/** Lancom */
-	CW_MODE_LANCOM
+	CW_MODE_LANCOM,
+	/** Fortinet */
+	CW_MODE_FORTINET
 };
 
 
diff --git a/src/capwap/capwap.h b/src/capwap/capwap.h
index 292408ef..5cade442 100644
--- a/src/capwap/capwap.h
+++ b/src/capwap/capwap.h
@@ -521,6 +521,7 @@ extern int cw_readelem_vendor_specific_payload(void *data, int msgtype, int elem
 #define CW_VENDOR_ID_ZYXEL	890
 #define CW_VENDOR_ID_CISCO	LW_VENDOR_ID_CISCO
 #define CW_VENDOR_ID_LANCOM	2356
+#define CW_VENDOR_ID_FORTINET	12356
 
 
 
diff --git a/src/capwap/capwap_strings_vendor.c b/src/capwap/capwap_strings_vendor.c
index 00ed5443..8e13cd45 100644
--- a/src/capwap/capwap_strings_vendor.c
+++ b/src/capwap/capwap_strings_vendor.c
@@ -6,5 +6,6 @@ struct cw_str capwap_strings_vendor[] = {
 { CW_VENDOR_ID_ZYXEL, "Zyxel" },
 { CW_VENDOR_ID_FSF, "FSF"},
 { CW_VENDOR_ID_LANCOM, "Lancom"},
+{ CW_VENDOR_ID_FORTINET, "Fortinet"},
 { CW_STR_STOP, "Unknown" }
 };