diff --git a/lib/core/session.py b/lib/core/session.py
index 799342bcc..a5f9b976f 100644
--- a/lib/core/session.py
+++ b/lib/core/session.py
@@ -32,7 +32,6 @@ def setDbms(dbms):
         dbms = _.group(1)
 
     Backend.setDbms(dbms)
-
     logger.info("the back-end DBMS is %s" % Backend.getDbms())
 
 def setOs():
diff --git a/lib/core/settings.py b/lib/core/settings.py
index e86773aa9..8838f9f56 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.5.19"
+VERSION = "1.0.5.20"
 REVISION = getRevisionNumber()
 STABLE = VERSION.count('.') <= 2
 VERSION_STRING = "sqlmap/%s#%s" % (VERSION, "stable" if STABLE else "dev")
diff --git a/plugins/dbms/mysql/fingerprint.py b/plugins/dbms/mysql/fingerprint.py
index 5cd9a5c47..c9db41244 100644
--- a/plugins/dbms/mysql/fingerprint.py
+++ b/plugins/dbms/mysql/fingerprint.py
@@ -103,6 +103,9 @@ class Fingerprint(GenericFingerprint):
         value += "back-end DBMS: "
         actVer = Format.getDbms()
 
+        if inject.checkBooleanExpression("@@USERSTAT LIKE @@USERSTAT"):
+            actVer += " (MariaDB fork)"
+
         if not conf.extensiveFp:
             value += actVer
             return value
diff --git a/xml/errors.xml b/xml/errors.xml
index bc16a43bd..d01f6a875 100644
--- a/xml/errors.xml
+++ b/xml/errors.xml
@@ -7,7 +7,7 @@
         <error regexp="Warning.*mysql_.*"/>
         <error regexp="MySqlException \(0x"/>
         <error regexp="valid MySQL result"/>
-        <error regexp="check the manual that corresponds to your MySQL server version"/>
+        <error regexp="check the manual that corresponds to your (MySQL|MariaDB) server version"/>
         <error regexp="MySqlClient\."/>
         <error regexp="com\.mysql\.jdbc\.exceptions"/>
     </dbms>