diff --git a/device-types/Fortinet/FG-400F.yaml b/device-types/Fortinet/FG-400F.yaml
new file mode 100644
index 000000000..cbdccebb3
--- /dev/null
+++ b/device-types/Fortinet/FG-400F.yaml
@@ -0,0 +1,91 @@
+---
+manufacturer: Fortinet
+model: FortiGate 400F
+slug: fortinet-fg-400f
+part_number: FG-400F
+u_height: 1
+is_full_depth: false
+weight: 6.4
+weight_unit: kg
+airflow: front-to-rear
+front_image: true
+rear_image: true
+comments: '[FortiGate 400F Series Datasheet](https://www.fortinet.com/content/dam/fortinet/assets/data-sheets/fortigate-400f-series.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'
+interfaces:
+  - name: ha
+    type: 1000base-t
+  - name: mgmt
+    type: 1000base-t
+    mgmt_only: true
+  - name: port1
+    type: 1000base-t
+  - name: port2
+    type: 1000base-t
+  - name: port3
+    type: 1000base-t
+  - name: port4
+    type: 1000base-t
+  - name: port5
+    type: 1000base-t
+  - name: port6
+    type: 1000base-t
+  - name: port7
+    type: 1000base-t
+  - name: port8
+    type: 1000base-t
+  - name: port9
+    type: 1000base-t
+  - name: port10
+    type: 1000base-t
+  - name: port11
+    type: 1000base-t
+  - name: port12
+    type: 1000base-t
+  - name: port13
+    type: 1000base-t
+  - name: port14
+    type: 1000base-t
+  - name: port15
+    type: 1000base-t
+  - name: port16
+    type: 1000base-t
+  - name: port17
+    type: 10gbase-x-sfpp
+  - name: port18
+    type: 10gbase-x-sfpp
+  - name: port19
+    type: 10gbase-x-sfpp
+  - name: port20
+    type: 10gbase-x-sfpp
+  - name: port21
+    type: 10gbase-x-sfpp
+  - name: port22
+    type: 10gbase-x-sfpp
+  - name: port23
+    type: 10gbase-x-sfpp
+  - name: port24
+    type: 10gbase-x-sfpp
+  - name: port25
+    type: 1000base-x-sfp
+  - name: port26
+    type: 1000base-x-sfp
+  - name: port27
+    type: 1000base-x-sfp
+  - name: port28
+    type: 1000base-x-sfp
+  - name: port29
+    type: 1000base-x-sfp
+  - name: port30
+    type: 1000base-x-sfp
+  - name: port31
+    type: 1000base-x-sfp
+  - name: port32
+    type: 1000base-x-sfp
diff --git a/elevation-images/Fortinet/fortinet-fg-400f.front.png b/elevation-images/Fortinet/fortinet-fg-400f.front.png
new file mode 100644
index 000000000..15141f33a
Binary files /dev/null and b/elevation-images/Fortinet/fortinet-fg-400f.front.png differ
diff --git a/elevation-images/Fortinet/fortinet-fg-400f.rear.png b/elevation-images/Fortinet/fortinet-fg-400f.rear.png
new file mode 100644
index 000000000..16c69d7cc
Binary files /dev/null and b/elevation-images/Fortinet/fortinet-fg-400f.rear.png differ
diff --git a/module-types/Fortinet/SP-FG400F-PS.yaml b/module-types/Fortinet/SP-FG400F-PS.yaml
new file mode 100644
index 000000000..650add537
--- /dev/null
+++ b/module-types/Fortinet/SP-FG400F-PS.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Fortinet
+model: SP-FG400F-PS
+part_number: SP-FG400F-PS
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c14
+    maximum_draw: 189
+    allocated_draw: 154