diff --git a/boto-2.40.0-retry-float.patch b/boto-2.40.0-retry-float.patch
new file mode 100644
index 0000000..6fd1002
--- /dev/null
+++ b/boto-2.40.0-retry-float.patch
@@ -0,0 +1,13 @@
+Index: boto-2.40.0/boto/connection.py
+===================================================================
+--- boto-2.40.0.orig/boto/connection.py
++++ boto-2.40.0/boto/connection.py
+@@ -920,7 +920,7 @@ class AWSAuthConnection(object):
+         while i <= num_retries:
+             # Use binary exponential backoff to desynchronize client requests.
+             next_sleep = min(random.random() * (2 ** i),
+-                             boto.config.get('Boto', 'max_retry_delay', 60))
++                             boto.config.getfloat('Boto', 'max_retry_delay', 60))
+             try:
+                 # we now re-sign each request before it is retried
+                 boto.log.debug('Token: %s' % self.provider.security_token)
diff --git a/python-boto.spec b/python-boto.spec
index 69d6f35..5673890 100644
--- a/python-boto.spec
+++ b/python-boto.spec
@@ -42,6 +42,11 @@ Patch2:         boto-2.40.0-nat-gateway.patch
 # https://github.com/boto/boto/pull/3553
 Patch3:         boto-2.40.0-sigv4-protocol.patch
 
+# Fix max_retry_delay config option
+# https://github.com/boto/boto/pull/3506
+# https://github.com/boto/boto/pull/3508
+Patch4:         boto-2.40.0-retry-float.patch
+
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
 BuildRequires:  python-six
@@ -124,6 +129,7 @@ cloud systems like Eucalyptus, OpenStack and Open Nebula.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 rm -r boto/vendored
 
@@ -186,6 +192,7 @@ mv $RPM_BUILD_ROOT/%{_bindir} examples
 - Cleaned up spec file
 - Added NAT gateway support
 - Fixed sigv4 protocol selection
+- Fixed max_retry_delay config option
 
 * Mon May 23 2016 Jon Ciesla <limburgher@gmail.com> - 2.40.0-1
 - 2.40.0.