diff --git a/docs/docgen.rb b/docs/docgen.rb
index 01cf76d31..26b057e49 100644
--- a/docs/docgen.rb
+++ b/docs/docgen.rb
@@ -72,8 +72,12 @@ class LogStashConfigDocGenerator
     # This will let us align comments with config options.
     name, opts = eval(code)
 
+    # TODO(sissel): This hack is only required until regexp configs
+    # are gone from logstash.
+    name = name.to_s unless name.is_a?(Regexp)
+
     description = BlueCloth.new(@comments.join("\n")).to_html
-    @attributes[name.to_s][:description] = description
+    @attributes[name][:description] = description
     clear_comments
   end # def add_config