diff --git a/rietveld.py b/rietveld.py
index 39cb19a9d..9dfe8892b 100644
--- a/rietveld.py
+++ b/rietveld.py
@@ -18,6 +18,7 @@ import copy
 import json
 import logging
 import re
+import ssl
 import time
 import urllib2
 
@@ -405,6 +406,11 @@ class Rietveld(object):
               not 'EOF occurred in violation of protocol' in e.reason):
             # Usually internal GAE flakiness.
             raise
+        except ssl.SSLError, e:
+          if retry >= (maxtries - 1):
+            raise
+          if not 'timed out' in e.reason:
+            raise
         # If reaching this line, loop again. Uses a small backoff.
         time.sleep(1+maxtries*2)
     finally: