diff --git a/device-types/Fortinet/FG-600F.yaml b/device-types/Fortinet/FG-600F.yaml
new file mode 100644
index 000000000..0372dc2f1
--- /dev/null
+++ b/device-types/Fortinet/FG-600F.yaml
@@ -0,0 +1,90 @@
+---
+manufacturer: Fortinet
+model: FortiGate 600F
+slug: fg-600f
+part_number: FG-600F
+u_height: 1
+is_full_depth: false
+comments: Same as FG-601F, but **WITHOUT** 2 x 240GB SSDs on-board.
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 255
+    allocated_draw: 169
+  - name: PS2
+    type: iec-60320-c14
+    maximum_draw: 255
+    allocated_draw: 169
+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: 1000base-x-sfp
+  - name: port18
+    type: 1000base-x-sfp
+  - name: port19
+    type: 1000base-x-sfp
+  - name: port20
+    type: 1000base-x-sfp
+  - name: port21
+    type: 1000base-x-sfp
+  - name: port22
+    type: 1000base-x-sfp
+  - name: port23
+    type: 1000base-x-sfp
+  - name: port24
+    type: 1000base-x-sfp
+  - name: x1
+    type: 10gbase-x-sfpp
+  - name: x2
+    type: 10gbase-x-sfpp
+  - name: x3
+    type: 10gbase-x-sfpp
+  - name: x4
+    type: 10gbase-x-sfpp
+  - name: x5
+    type: 25gbase-x-sfp28
+  - name: x6
+    type: 25gbase-x-sfp28
+  - name: x7
+    type: 25gbase-x-sfp28
+  - name: x8
+    type: 25gbase-x-sfp28
diff --git a/device-types/Fortinet/FG-601F.yaml b/device-types/Fortinet/FG-601F.yaml
new file mode 100644
index 000000000..e790eb74e
--- /dev/null
+++ b/device-types/Fortinet/FG-601F.yaml
@@ -0,0 +1,90 @@
+---
+manufacturer: Fortinet
+model: FortiGate 601F
+slug: fg-601f
+part_number: FG-601F
+u_height: 1
+is_full_depth: false
+comments: Same as FG-600F, but **WITH** 2 x 240GB SSDs on-board.
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 255
+    allocated_draw: 169
+  - name: PS2
+    type: iec-60320-c14
+    maximum_draw: 255
+    allocated_draw: 169
+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: 1000base-x-sfp
+  - name: port18
+    type: 1000base-x-sfp
+  - name: port19
+    type: 1000base-x-sfp
+  - name: port20
+    type: 1000base-x-sfp
+  - name: port21
+    type: 1000base-x-sfp
+  - name: port22
+    type: 1000base-x-sfp
+  - name: port23
+    type: 1000base-x-sfp
+  - name: port24
+    type: 1000base-x-sfp
+  - name: x1
+    type: 10gbase-x-sfpp
+  - name: x2
+    type: 10gbase-x-sfpp
+  - name: x3
+    type: 10gbase-x-sfpp
+  - name: x4
+    type: 10gbase-x-sfpp
+  - name: x5
+    type: 25gbase-x-sfp28
+  - name: x6
+    type: 25gbase-x-sfp28
+  - name: x7
+    type: 25gbase-x-sfp28
+  - name: x8
+    type: 25gbase-x-sfp28