diff --git a/target/linux/mvebu/cortexa9/base-files/etc/board.d/02_network b/target/linux/mvebu/cortexa9/base-files/etc/board.d/02_network
index 8cf1c0e426..484ebe3db2 100644
--- a/target/linux/mvebu/cortexa9/base-files/etc/board.d/02_network
+++ b/target/linux/mvebu/cortexa9/base-files/etc/board.d/02_network
@@ -21,6 +21,7 @@ mvebu_setup_interfaces()
 		ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3 lan4" "eth2"
 		;;
 	fortinet,fg-30e|\
+	fortinet,fwf-30e|\
 	linksys,wrt1200ac|\
 	linksys,wrt1900ac-v1|\
 	linksys,wrt1900ac-v2|\
diff --git a/target/linux/mvebu/cortexa9/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/cortexa9/base-files/lib/upgrade/platform.sh
index 13d8e77c93..9f24fcfdef 100755
--- a/target/linux/mvebu/cortexa9/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mvebu/cortexa9/base-files/lib/upgrade/platform.sh
@@ -53,6 +53,7 @@ platform_do_upgrade() {
 		legacy_sdcard_do_upgrade "$1"
 		;;
 	fortinet,fg-30e|\
+	fortinet,fwf-30e|\
 	fortinet,fg-50e|\
 	fortinet,fg-51e|\
 	fortinet,fg-52e|\
diff --git a/target/linux/mvebu/files/arch/arm/boot/dts/marvell/armada-385-fortinet-fwf-30e.dts b/target/linux/mvebu/files/arch/arm/boot/dts/marvell/armada-385-fortinet-fwf-30e.dts
new file mode 100644
index 0000000000..df463ed111
--- /dev/null
+++ b/target/linux/mvebu/files/arch/arm/boot/dts/marvell/armada-385-fortinet-fwf-30e.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "armada-385-fortinet-fg-3xe.dtsi"
+
+
+/ {
+        model = "Fortinet FortiWiFi 30E";
+        compatible = "fortinet,fwf-30e", "marvell,armada385", "marvell,armada380";
+};
+
+&pciec {
+        status = "okay";
+};
+
+&pcie2 {
+        status = "okay";
+};
diff --git a/target/linux/mvebu/image/cortexa9.mk b/target/linux/mvebu/image/cortexa9.mk
index 72d7f9dc2a..6c6889b542 100644
--- a/target/linux/mvebu/image/cortexa9.mk
+++ b/target/linux/mvebu/image/cortexa9.mk
@@ -135,6 +135,16 @@ define Device/fortinet_fg-30e
 endef
 TARGET_DEVICES += fortinet_fg-30e
 
+define Device/fortinet_fwf-30e
+  $(Device/fortinet)
+  DEVICE_MODEL := FortiWiFi 30E
+  DEVICE_DTS := armada-385-fortinet-fwf-30e
+  KERNEL_INITRAMFS := kernel-bin | append-dtb | fortigate-header | \
+    gzip-filename FWF30E
+  DEVICE_PACKAGES += kmod-ath9k wpad-basic-mbedtls
+endef
+TARGET_DEVICES += fortinet_fwf-30e
+
 define Device/fortinet_fg-50e
   $(Device/fortinet)
   DEVICE_MODEL := FortiGate 50E