diff --git a/git_cl.py b/git_cl.py
index 4c5f9634c..d920bce88 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -1698,9 +1698,13 @@ def RietveldUpload(options, args, cl, change):
                     if ': ' in line)
         remote_url = keys.get('URL', None)
     else:
-      if cl.GetRemoteUrl() and '/' in cl.GetUpstreamBranch():
-        remote_url = (cl.GetRemoteUrl() + '@'
-                      + cl.GetUpstreamBranch().split('/')[-1])
+      remote = cl.GetRemoteUrl()
+      branch = cl.GetUpstreamBranch()
+      if remote and branch:
+        if 'googlesource' in remote:
+          remote_url = remote + '/+/' + branch.split('/')[-1]
+        else:
+          remote_url = remote + '@' + branch.split('/')[-1]
   if remote_url:
     upload_args.extend(['--base_url', remote_url])