diff --git a/lib/gollum/markup.rb b/lib/gollum/markup.rb
index 279991c3..9b35f0f8 100644
--- a/lib/gollum/markup.rb
+++ b/lib/gollum/markup.rb
@@ -87,7 +87,7 @@ module Gollum
     def process_headers(doc)
       toc = nil
       doc.css('h1,h2,h3,h4,h5,h6').each do |h|
-        id = encodeURIComponent(h.content.gsub(' ','-'))
+        id = CGI::escape(h.content.gsub(' ','-'))
         level = h.name.gsub(/[hH]/,'').to_i
 
         # Add anchors