diff --git a/Documentation/markdown.md b/Documentation/markdown.md
index 8bf28f5..a5d5ec1 100644
--- a/Documentation/markdown.md
+++ b/Documentation/markdown.md
@@ -1,6 +1,6 @@
 # Markdown
 
-The [Gitiles](https://code.google.com/p/gitiles/) source browser
+The [Gitiles](https://gerrit.googlesource.com/gitiles/) source browser
 automatically renders `*.md` Markdown files into HTML for simplified
 documentation.
 
diff --git a/README.md b/README.md
index 4bb030d..bdeba97 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,11 @@
 `gitiles.config`. Refer to the [configuration documentation](/Documentation/config.md)
 for details.
 
+## Bugs
+
+Use the [issue tracker at github](https://github.com/google/gitiles/issues) to
+file bugs.
+
 ## Contributing to Gitiles
 
 Please refer to the [Developer Guide](/Documentation/developer-guide.md).
diff --git a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/Common.soy b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/Common.soy
index 9ca25d3..ca3e21f 100644
--- a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/Common.soy
+++ b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/Common.soy
@@ -112,7 +112,7 @@
  */
 {template .footerPoweredBy}
 <span class="Footer-poweredBy">
-  Powered by <a href="https://code.google.com/p/gitiles/">Gitiles</a>
+  Powered by <a href="https://gerrit.googlesource.com/gitiles/">Gitiles</a>
 </span>
 {/template}
 
diff --git a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/Doc.soy b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/Doc.soy
index b62e2ee..2193c93 100644
--- a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/Doc.soy
+++ b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/Doc.soy
@@ -66,7 +66,7 @@
   <footer class="Site-footer">
     <div class="Footer">
       <div class="Footer-poweredBy">
-        Powered by <a href="https://code.google.com/p/gitiles/">Gitiles</a>
+        Powered by <a href="https://gerrit.googlesource.com/gitiles/">Gitiles</a>
       </div>
       <div class="Footer-links">
         {if $sourceUrl}<a class="Footer-link" href="{$sourceUrl}">{msg desc="text for the source link"}source{/msg}</a>{/if}