diff --git a/doc/THANKS b/doc/THANKS
index beeedf8b2..2b0a015a4 100644
--- a/doc/THANKS
+++ b/doc/THANKS
@@ -269,6 +269,9 @@ Richard Safran <allapplyhere@yahoo.com>
 Tomoyuki Sakurai <cherry@trombik.org>
     for submitting to the FreeBSD project the sqlmap 0.5 port
 
+Marek Sarvas <marek.sarvas@gmail.com>
+    for reporting a minor bug
+
 Philippe A. R. Schaeffer <schaeff@compuphil.de>
     for reporting a minor bug
 
diff --git a/lib/request/basic.py b/lib/request/basic.py
index 28e208e7e..ddba7b6d8 100644
--- a/lib/request/basic.py
+++ b/lib/request/basic.py
@@ -100,8 +100,10 @@ def checkCharEncoding(encoding):
     translate = { 'windows-874':'iso-8859-11' }
 
     #http://philip.html5.org/data/charsets-2.html
-    if encoding and encoding.startswith('cp-'):
+    if encoding.startswith('cp-'):
         encoding = 'cp%s' % encoding[3:]
+    elif ';' in encoding:
+        encoding = encoding[:encoding.find(';')]
     elif encoding in translate:
         encoding = translate[encoding]
     try: