diff --git a/device-types/Firewalla/Firewalla-Gold-Plus.yml b/device-types/Firewalla/Firewalla-Gold-Plus.yml
new file mode 100644
index 000000000..ece6b4a7b
--- /dev/null
+++ b/device-types/Firewalla/Firewalla-Gold-Plus.yml
@@ -0,0 +1,32 @@
+---
+manufacturer: Firewalla
+model: Firewalla Gold Plus
+slug: firewalla-gold-plus
+u_height: 1
+is_full_depth: false
+airflow: passive
+weight: 19.9
+weight_unit: oz
+front_image: true
+rear_image: true
+console-ports:
+  - name: Console01
+    type: rj-45
+power-ports:
+  - name: Power01
+    type: dc-terminal
+    maximum_draw: 15
+    allocated_draw: 10
+    description: Standard Barrel Plug
+interfaces:
+  - name: GigE0/1
+    type: 2.5gbase-t
+  - name: GigE0/2
+    type: 2.5gbase-t
+  - name: GigE0/3
+    type: 2.5gbase-t
+  - name: GigE0/4
+    type: 2.5gbase-t
+  - name: USB01
+    type: other
+    description: USB port for Wifi Adapter, etc.
diff --git a/elevation-images/Firewalla/firewalla-gold-plus.front.png b/elevation-images/Firewalla/firewalla-gold-plus.front.png
new file mode 100644
index 000000000..bf4c18735
Binary files /dev/null and b/elevation-images/Firewalla/firewalla-gold-plus.front.png differ
diff --git a/elevation-images/Firewalla/firewalla-gold-plus.rear.png b/elevation-images/Firewalla/firewalla-gold-plus.rear.png
new file mode 100644
index 000000000..3b8191b22
Binary files /dev/null and b/elevation-images/Firewalla/firewalla-gold-plus.rear.png differ