diff --git a/lib/core/optiondict.py b/lib/core/optiondict.py
index e73c4c978..6956db8ae 100644
--- a/lib/core/optiondict.py
+++ b/lib/core/optiondict.py
@@ -137,7 +137,6 @@ optDict = {
                                "col":               "string",
                                "excludeCol":        "string",
                                "pivotColumn":       "string",
-                               "binaryFields":      "string",
                                "dumpWhere":         "string",
                                "user":              "string",
                                "excludeSysDbs":     "boolean",
@@ -191,6 +190,7 @@ optDict = {
                                #"xmlFile":           "string",
                                "trafficFile":       "string",
                                "batch":             "boolean",
+                               "binaryFields":      "string",
                                "charset":           "string",
                                "crawlDepth":        "integer",
                                "crawlExclude":      "string",
diff --git a/lib/core/settings.py b/lib/core/settings.py
index eb603657e..8c2fe1fbf 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.7"
+VERSION = "1.0.5.8"
 REVISION = getRevisionNumber()
 STABLE = VERSION.count('.') <= 2
 VERSION_STRING = "sqlmap/%s#%s" % (VERSION, "stable" if STABLE else "dev")
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
index 58d0cdc8a..98dd87db9 100644
--- a/lib/parse/cmdline.py
+++ b/lib/parse/cmdline.py
@@ -464,9 +464,6 @@ def cmdLineParser(argv=None):
                                help="Exclude DBMS system databases when "
                                     "enumerating tables")
 
-        enumeration.add_option("--binary-fields", dest="binaryFields",
-                          help="Result fields having binary values (e.g. \"digest\")")
-
         enumeration.add_option("--pivot-column", dest="pivotColumn",
                                help="Pivot column name")
 
@@ -623,6 +620,9 @@ def cmdLineParser(argv=None):
                             action="store_true",
                             help="Never ask for user input, use the default behaviour")
 
+        general.add_option("--binary-fields", dest="binaryFields",
+                          help="Result fields having binary values (e.g. \"digest\")")
+
         general.add_option("--charset", dest="charset",
                             help="Force character encoding used for data retrieval")
 
diff --git a/sqlmap.conf b/sqlmap.conf
index 8299885bd..54577660f 100644
--- a/sqlmap.conf
+++ b/sqlmap.conf
@@ -482,9 +482,6 @@ col =
 # Back-end database management system database table column(s) to not enumerate.
 excludeCol = 
 
-# Result fields having binary values (e.g. "digest").
-binaryFields =
-
 # Pivot column name.
 pivotColumn =
 
@@ -656,6 +653,9 @@ trafficFile =
 # Valid: True or False
 batch = False
 
+# Result fields having binary values (e.g. "digest").
+binaryFields =
+
 # Force character encoding used for data retrieval.
 charset =