diff --git a/lib/core/settings.py b/lib/core/settings.py
index 23c6fd295..ba300b9f7 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -19,7 +19,7 @@ from lib.core.enums import OS
 from lib.core.revision import getRevisionNumber
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.0.8.17"
+VERSION = "1.0.8.18"
 REVISION = getRevisionNumber()
 TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
diff --git a/txt/checksum.md5 b/txt/checksum.md5
index 1850404bd..3f8eb145c 100644
--- a/txt/checksum.md5
+++ b/txt/checksum.md5
@@ -45,7 +45,7 @@ e60456db5380840a586654344003d4e6  lib/core/readlineng.py
 5ef56abb8671c2ca6ceecb208258e360  lib/core/replication.py
 99a2b496b9d5b546b335653ca801153f  lib/core/revision.py
 7c15dd2777af4dac2c89cab6df17462e  lib/core/session.py
-c857eea31beebb5aac5719c2329bbaf3  lib/core/settings.py
+636be763d8ddac748b6455f732b711ce  lib/core/settings.py
 7af83e4f18cab6dff5e67840eb65be80  lib/core/shell.py
 23657cd7d924e3c6d225719865855827  lib/core/subprocessng.py
 0bc2fae1dec18cdd11954b22358293f2  lib/core/target.py
@@ -426,6 +426,7 @@ b5ea5375df444e0240f1ee0e2a8e52fb  waf/trafficshield.py
 7a723ce2f1b82d7297a2ab025d5ca0be  waf/webappsecure.py
 75e51fea7f206e8faa2f743e44e58383  waf/webknight.py
 3bcac085dcd9ed26b50a2320e418e9f3  waf/yundun.py
+2a57f322f0b6e7b11b8df0909816a34f  waf/yunsuo.py
 2d53fdaca0d7b42edad5192661248d76  xml/banner/cookie.xml
 37603bc0905af0c65480a2ca959990ec  xml/banner/generic.xml
 d8925c034263bf1b83e7d8e1c78eec57  xml/banner/mssql.xml
diff --git a/waf/yunsuo.py b/waf/yunsuo.py
new file mode 100644
index 000000000..37eedcea5
--- /dev/null
+++ b/waf/yunsuo.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+
+"""
+Copyright (c) 2006-2016 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__ = "Yunsuo Web Application Firewall (Yunsuo)"
+
+def detect(get_page):
+    retval = False
+
+    for vector in WAF_ATTACK_VECTORS:
+        page, headers, _ = get_page(get=vector)
+        retval = re.search(r"<img class=\"yunsuologo\"", page, re.I) is not None
+        retval |= re.search(r"yunsuo_session", headers.get(HTTP_HEADER.SET_COOKIE, ""), re.I) is not None
+        if retval:
+            break
+
+    return retval