diff --git a/BUCK b/BUCK
index 62edda8..62a3d92 100644
--- a/BUCK
+++ b/BUCK
@@ -1,6 +1,9 @@
 include_defs('//bucklets/gerrit_plugin.bucklet')
 include_defs('//bucklets/maven_jar.bucklet')
 
+define_license('commonmark')
+define_license('autolink')
+
 genrule(
   name = 'gitiles',
   cmd = ' && '.join([
@@ -25,6 +28,11 @@
     ':guice-multibindings',
     ':nullable-jsr305',
     ':soy',
+    ':commonmark',
+    ':cm-autolink',
+    ':gfm-tables',
+    ':gfm-strikethrough',
+
   ],
   resources = glob(['src/main/resources/**/*']),
   manifest_entries = [
@@ -49,8 +57,8 @@
 
 maven_jar(
   name = 'gitiles-servlet',
-  id = 'com.google.gitiles:gitiles-servlet:0.1-9',
-  sha1 = '653b054661425499b55400888c35b55089f8816b',
+  id = 'com.google.gitiles:gitiles-servlet:0.1-10',
+  sha1 = '426ddf32e19891821f278417160f1325b9896b76',
   deps = [':prettify'],
   license = 'Apache2.0',
   repository = GERRIT,
@@ -117,3 +125,50 @@
   exclude_java_sources = True,
   visibility = [],
 )
+
+COMMONMARK_VERSION = '0.5.1'
+maven_jar(
+  name = 'commonmark',
+  id = 'com.atlassian.commonmark:commonmark:' + COMMONMARK_VERSION,
+  sha1 = 'b35ae2353871955674bbfa1a92394272b1dada45',
+  license = 'commonmark',
+  local_license = True,
+)
+
+maven_jar(
+  name = 'cm-autolink',
+  id = 'com.atlassian.commonmark:commonmark-ext-autolink:' + COMMONMARK_VERSION,
+  sha1 = '29bb9d22a7aaf5bd8f23d8cbdd9f438f07e26735',
+  license = 'commonmark',
+  local_license = True,
+  deps = [
+    ':commonmark',
+    ':autolink',
+  ],
+  )
+
+maven_jar(
+  name = 'autolink',
+  id = 'org.nibor.autolink:autolink:0.4.0',
+  sha1 = '764f7b0147a0675d971a34282dce9ec76b8307c9',
+  license = 'autolink',
+  local_license = True,
+)
+
+maven_jar(
+  name = 'gfm-strikethrough',
+  id = 'com.atlassian.commonmark:commonmark-ext-gfm-strikethrough:' + COMMONMARK_VERSION,
+  sha1 = 'acc28d79c4e00a6e24017596dd22ce757df71db3',
+  license = 'commonmark',
+  local_license = True,
+  deps = [':commonmark'],
+)
+
+maven_jar(
+  name = 'gfm-tables',
+  id = 'com.atlassian.commonmark:commonmark-ext-gfm-tables:' + COMMONMARK_VERSION,
+  sha1 = '5cdc350f7e498458e5ed6751771c5e8c3efc107e',
+  license = 'commonmark',
+  local_license = True,
+  deps = [':commonmark'],
+)
diff --git a/LICENSE-autolink b/LICENSE-autolink
new file mode 100644
index 0000000..565820a
--- /dev/null
+++ b/LICENSE-autolink
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Robin Stocker
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/LICENSE-commonmark b/LICENSE-commonmark
new file mode 100644
index 0000000..3fecb98
--- /dev/null
+++ b/LICENSE-commonmark
@@ -0,0 +1,23 @@
+Copyright (c) 2015-2016, Atlassian Pty Ltd
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+      IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+      DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+      FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+      DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+      SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+      CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+      OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+      OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.