diff --git a/waf/safe3.py b/waf/safe3.py
new file mode 100644
index 000000000..d1aaacfc5
--- /dev/null
+++ b/waf/safe3.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+
+"""
+Copyright (c) 2006-2015 sqlmap developers (http://sqlmap.org/)
+See the file 'doc/COPYING' for copying permission
+"""
+
+import re
+
+from lib.core.enums import HTTP_HEADER
+from lib.core.settings import WAF_ATTACK_VECTORS
+
+__product__ = "Safe3 Web Application Firewall"
+
+def detect(get_page):
+    retval = False
+
+    for vector in WAF_ATTACK_VECTORS:
+        page, headers, code = get_page(get=vector)
+        retval = re.search(r"Safe3WAF", headers.get("X-Powered-By", ""), re.I) is not None
+        retval |= re.search(r"Safe3 Web Firewall", headers.get(HTTP_HEADER.SERVER, ""), re.I) is not None
+        if retval:
+            break
+
+    return retval
+
diff --git a/waf/safedog.py b/waf/safedog.py
index 31b706e18..f4bc339ec 100644
--- a/waf/safedog.py
+++ b/waf/safedog.py
@@ -7,6 +7,7 @@ See the file 'doc/COPYING' for copying permission
 
 import re
 
+from lib.core.enums import HTTP_HEADER
 from lib.core.settings import WAF_ATTACK_VECTORS
 
 __product__ = "Safedog Web Application Firewall (Safedog)"
@@ -17,6 +18,8 @@ def detect(get_page):
     for vector in WAF_ATTACK_VECTORS:
         page, headers, code = get_page(get=vector)
         retval = re.search(r"WAF/2.0", headers.get("X-Powered-By", ""), re.I) is not None
+        retval |= re.search(r"Safedog", headers.get(HTTP_HEADER.SERVER, ""), re.I) is not None
+        retval |= re.search(r"safedog", headers.get("Set-Cookie", ""), re.I) is not None
         if retval:
             break