diff --git a/lib/gollum/markup.rb b/lib/gollum/markup.rb
index 97d15c7e..b977bc58 100644
--- a/lib/gollum/markup.rb
+++ b/lib/gollum/markup.rb
@@ -116,6 +116,9 @@ module Gollum
     #
     # Returns the placeholder'd String data.
     def extract_tags(data)
+      if @format == :asciidoc
+        return data
+      end
       data.gsub!(/(.?)\[\[(.+?)\]\]([^\[]?)/m) do
         if $1 == "'" && $3 != "'"
           "[[#{$2}]]#{$3}"
diff --git a/test/test_markup.rb b/test/test_markup.rb
index f9f176c3..1175201a 100644
--- a/test/test_markup.rb
+++ b/test/test_markup.rb
@@ -588,6 +588,19 @@ np.array([[2,2],[1,3]],np.float)
     compare(content, output, 'md')
   end
 
+  #########################################################################
+  # Asciidoc
+  #########################################################################
+
+  test "asciidoc header" do 
+    compare("= Book Title\n\n== Heading", '<div class="sect1"><h2 id="wiki-_heading">Heading</h2><div class="sectionbody"></div></div>', 'asciidoc')
+  end
+
+  test "internal links with asciidoc" do 
+    compare("= Book Title\n\n[[anid]]\n== Heading", '<div class="sect1"><h2 id="wiki-anid">Heading</h2><div class="sectionbody"></div></div>', 'asciidoc')
+  end
+
+
   #########################################################################
   #
   # Helpers