diff --git a/plugins/dbms/maxdb/enumeration.py b/plugins/dbms/maxdb/enumeration.py
index ae449fd86..6c5dedf5e 100644
--- a/plugins/dbms/maxdb/enumeration.py
+++ b/plugins/dbms/maxdb/enumeration.py
@@ -22,6 +22,8 @@ with sqlmap; if not, write to the Free Software Foundation, Inc., 51
 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 """
 
+from lib.core.data import logger
+
 from plugins.generic.enumeration import Enumeration as GenericEnumeration
 
 class Enumeration(GenericEnumeration):
diff --git a/plugins/dbms/maxdb/fingerprint.py b/plugins/dbms/maxdb/fingerprint.py
index 5e9dbbd48..2c40f8b2a 100644
--- a/plugins/dbms/maxdb/fingerprint.py
+++ b/plugins/dbms/maxdb/fingerprint.py
@@ -44,6 +44,46 @@ class Fingerprint(GenericFingerprint):
     def __init__(self):
         GenericFingerprint.__init__(self)
 
+    def __versionCheck(self):
+        infoMsg = "executing SAP MaxDB SYSINFO version check"
+        logger.info(infoMsg)
+
+        query   = agent.prefixQuery(" /* NoValue */")
+        query   = agent.postfixQuery(query)
+        payload = agent.payload(newValue=query)
+        result  = Request.queryPage(payload)
+
+        if not result:
+            warnMsg = "unable to perform SAP MaxDB version check"
+            logger.warn(warnMsg)
+
+            return None
+
+        minor, major = None, None
+
+        for version in [6, 7]:
+            query   = agent.prefixQuery(" AND (SELECT MAJORVERSION FROM SYSINFO.VERSION)=%d" % version)
+            query   = agent.postfixQuery(query)
+            payload = agent.payload(newValue=query)
+            result  = Request.queryPage(payload)
+
+            if result:
+                major = version
+
+        for version in xrange(0, 10):
+            query   = agent.prefixQuery(" AND (SELECT MINORVERSION FROM SYSINFO.VERSION)=%d" % version)
+            query   = agent.postfixQuery(query)
+            payload = agent.payload(newValue=query)
+            result  = Request.queryPage(payload)
+
+            if result:
+                minor = version
+
+        if major and minor:
+            return "%s.%s" % (major, minor)
+        else:
+            return None
+
     def getFingerprint(self):
         value  = ""
         wsOsFp = formatFingerprint("web server", kb.headersFp)
@@ -64,7 +104,7 @@ class Fingerprint(GenericFingerprint):
             value += "SAP MaxDB"
             return value
 
-        actVer = formatDBMSfp() + " (%s)" % None
+        actVer = formatDBMSfp() + " (%s)" % self.__versionCheck()
         blank  = " " * 15
         value += "active fingerprint: %s" % actVer