diff --git a/includes/osdiscovery/discover-sonicwall.php b/includes/osdiscovery/discover-sonicwall.php
new file mode 100644
index 000000000..31c150379
--- /dev/null
+++ b/includes/osdiscovery/discover-sonicwall.php
@@ -0,0 +1,8 @@
+<?php
+
+if (!$os) 
+{
+  if (strstr($sysDescr, "SonicWALL")) { $os = "sonicwall"; }
+}
+
+?>
diff --git a/includes/static-config.php b/includes/static-config.php
index 3b3b4fb95..32d458a65 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -142,6 +142,11 @@ $config['os']['speedtouch']['text']     = "Thomson Speedtouch";
 $config['os']['speedtouch']['ifname']	= 1;
 $config['os']['speedtouch']['type']     = "network";
 
+$config['os']['sonicwal']['text']     	= "SonicWALL";
+$config['os']['sonicwal']['type']     	= "firewall";
+$config['os']['sonicwal']['overgraph'][]  = "device_bits";
+$config['os']['sonicwal']['overtext']     = "Traffic";
+
 $config['os']['zywall']['text']     	= "ZyXEL ZyWALL";
 $config['os']['zywall']['type']     	= "firewall";
 $config['os']['zywall']['overgraph'][]  = "device_bits";