diff --git a/rietveld.py b/rietveld.py
index 1c569fc9b..5d83cc61b 100644
--- a/rietveld.py
+++ b/rietveld.py
@@ -579,6 +579,9 @@ class JwtOAuth2Rietveld(Rietveld):
 
     self.url = url.rstrip('/')
     bot_url = self.url
+    # TODO(tandrii): remove temp fix due to cert problem: crbug/537763
+    if bot_url.endswith('codereview.chromium.org'):
+      bot_url = 'https://chromiumcodereview.appspot.com'
     if self.url.endswith('googleplex.com'):
       bot_url = self.url + '/bots'
 
diff --git a/third_party/upload.py b/third_party/upload.py
index 002a0d66a..2f33b5abd 100755
--- a/third_party/upload.py
+++ b/third_party/upload.py
@@ -2536,6 +2536,14 @@ def RealMain(argv, data=None):
   payload = urllib.urlencode(payload)
   rpc_server.Send("/" + issue + "/upload_complete/" + (patchset or ""),
                   payload=payload)
+  # TODO(tandrii): remove temp fix due to cert problem: crbug/537763
+  if ("codereview.chromium.org" in response_body and
+      (response_body.startswith("Issue created.") or
+        response_body.startswith("Issue updated."))):
+        print
+        print "NOTE: Due to certificate problems, try equivalent URL:"
+        print "https://chromiumcodereview.appspot.com/%s" % issue
+        print
   return issue, patchset