diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/doc/MarkdownToHtml.java b/gitiles-servlet/src/main/java/com/google/gitiles/doc/MarkdownToHtml.java
index 56199b9..9de1a09 100644
--- a/gitiles-servlet/src/main/java/com/google/gitiles/doc/MarkdownToHtml.java
+++ b/gitiles-servlet/src/main/java/com/google/gitiles/doc/MarkdownToHtml.java
@@ -228,6 +228,14 @@
           .open("span")
           .close("span")
           .close("a");
+      // github markdown compatibility
+      html.open("a")
+          .attribute("class", "h")
+          .attribute("name", id.toLowerCase())
+          .attribute("href", "#" + id.toLowerCase())
+          .open("span")
+          .close("span")
+          .close("a");
     }
     visitChildren(node);
     html.close(tag);