diff --git a/lib/github/markups.rb b/lib/github/markups.rb
index 9e23d124..7a3ae274 100644
--- a/lib/github/markups.rb
+++ b/lib/github/markups.rb
@@ -18,6 +18,10 @@
   Creole.creolize(content)
 end
 
+markup(:hikidoc, /hiki/) do |content|
+  HikiDoc.to_html(content)
+end
+
 command(:rest2html, /re?st(\.txt)?/)
 
 command('asciidoc -s --backend=xhtml11 -o - -', /asciidoc/)
diff --git a/test/markups/README.hiki b/test/markups/README.hiki
new file mode 100644
index 00000000..b36565cc
--- /dev/null
+++ b/test/markups/README.hiki
@@ -0,0 +1,2 @@
+* One
+* Two
diff --git a/test/markups/README.hiki.html b/test/markups/README.hiki.html
new file mode 100644
index 00000000..a1b9abab
--- /dev/null
+++ b/test/markups/README.hiki.html
@@ -0,0 +1,4 @@
+<ul>
+<li>One</li>
+<li>Two</li>
+</ul>