diff --git a/CHANGELOG.md b/CHANGELOG.md
index 896ce63..b98f6b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 1.2.2 (2017-09-06)
+- #59: Handle special value '__none__' for proxy (@andlam)
+
 ## 1.2.1 (2017-07-31)
 - #3: Add support for proxy in configurations and environment
   variables (@AgarFu)
diff --git a/Makefile b/Makefile
index 2b179bb..079c04c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 NAME    = yum-plugin-s3-iam
-VERSION = 1.2.1
+VERSION = 1.2.2
 RELEASE = 1
 ARCH    = noarch
 
diff --git a/s3iam.py b/s3iam.py
index 341f1d7..169cdf6 100755
--- a/s3iam.py
+++ b/s3iam.py
@@ -34,7 +34,7 @@
 __email__ = "julius@seporaitis.net"
 __copyright__ = "Copyright 2012, Julius Seporaitis"
 __license__ = "Apache 2.0"
-__version__ = "1.2.1"
+__version__ = "1.2.2"
 
 
 __all__ = ['requires_api_version', 'plugin_type', 'CONDUIT',
@@ -167,7 +167,7 @@ def __init__(self, repoid, repo):
             proxy_config['https'] = os.environ['https_proxy']
         if 'http_proxy' in os.environ:
             proxy_config['http'] = os.environ['http_proxy']
-        if repo.proxy:
+        if repo.proxy and repo.proxy != '__none__':
             proxy_config['https'] = proxy_config['http'] = repo.proxy
         if proxy_config:
             proxy = urllib2.ProxyHandler(proxy_config)
diff --git a/yum-plugin-s3-iam.spec b/yum-plugin-s3-iam.spec
index 1f9a2b4..5f7b477 100644
--- a/yum-plugin-s3-iam.spec
+++ b/yum-plugin-s3-iam.spec
@@ -37,6 +37,9 @@ rm -rf ${RPM_BUILD_ROOT}
 /usr/lib/yum-plugins/s3iam.py*
 
 %changelog
+* Fri May 05 2017 Mathias Brossard <mathias@brossard.org> 1.2.2-1
+- Handle special value '__none__' for proxy (@andlam)
+
 * Fri May 05 2017 Mathias Brossard <mathias@brossard.org> 1.2.1-1
 - Add support for proxy (@AgarFu)