diff --git a/lib/core/settings.py b/lib/core/settings.py
index bd0d866db..26a609ac0 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -18,7 +18,7 @@ from lib.core.enums import OS
 from thirdparty.six import unichr as _unichr
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.3.6.19"
+VERSION = "1.3.6.20"
 TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
 VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
diff --git a/plugins/dbms/postgresql/takeover.py b/plugins/dbms/postgresql/takeover.py
index f9ccb46b2..2e54f0236 100644
--- a/plugins/dbms/postgresql/takeover.py
+++ b/plugins/dbms/postgresql/takeover.py
@@ -47,22 +47,10 @@ class Takeover(GenericTakeover):
 
         banVer = kb.bannerFp["dbmsVersion"]
 
-        if banVer >= "9.4":
-            majorVer = "9.4"
-        elif banVer >= "9.3":
-            majorVer = "9.3"
-        elif banVer >= "9.2":
-            majorVer = "9.2"
-        elif banVer >= "9.1":
-            majorVer = "9.1"
-        elif banVer >= "9.0":
-            majorVer = "9.0"
-        elif banVer >= "8.4":
-            majorVer = "8.4"
-        elif banVer >= "8.3":
-            majorVer = "8.3"
-        elif banVer >= "8.2":
-            majorVer = "8.2"
+        if banVer >= "10":
+            majorVer = banVer.split('.')[0]
+        elif banVer >= "8.2" and '.' in banVer:
+            majorVer = '.'.join(banVer.split('.')[:2])
         else:
             errMsg = "unsupported feature on versions of PostgreSQL before 8.2"
             raise SqlmapUnsupportedFeatureException(errMsg)