diff --git a/.yardopts b/.yardopts
index 47b4efd1..08fed1c8 100644
--- a/.yardopts
+++ b/.yardopts
@@ -1,5 +1,7 @@
 --readme          README.md
 --markup          markdown
 --markup-provider maruku
+--default-return  ""
+--hide-void-return
 --protected
 --no-highlight
diff --git a/Rakefile b/Rakefile
index 320553d6..f428bc76 100644
--- a/Rakefile
+++ b/Rakefile
@@ -241,7 +241,7 @@ begin
       list.exclude('lib/haml/template/*.rb')
       list.exclude('lib/haml/helpers/action_view_mods.rb')
     end.to_a
-    t.options << '--use-cache' if Rake.application.top_level_tasks.include?('redoc')
+    t.options << '--incremental' if Rake.application.top_level_tasks.include?('redoc')
     t.options += FileList.new('yard/*.rb').to_a.map {|f| ['-e', f]}.flatten
     files = FileList.new('doc-src/*').to_a.sort_by {|s| s.size} + %w[MIT-LICENSE VERSION]
     t.options << '--files' << files.join(',')
diff --git a/haml.gemspec b/haml.gemspec
index a0c0f9ad..6ab225e3 100644
--- a/haml.gemspec
+++ b/haml.gemspec
@@ -22,7 +22,7 @@ HAML_GEMSPEC = Gem::Specification.new do |spec|
       but it can function as a stand-alone templating engine.
     END
 
-  spec.add_development_dependency 'yard', '>= 0.4.0'
+  spec.add_development_dependency 'yard', '>= 0.5.3'
   spec.add_development_dependency 'maruku', '>= 0.5.9'
 
   # We need the revision file to exist,
diff --git a/lib/sass/script/lexer.rb b/lib/sass/script/lexer.rb
index 268331e2..1be1be74 100644
--- a/lib/sass/script/lexer.rb
+++ b/lib/sass/script/lexer.rb
@@ -8,16 +8,16 @@ module Sass
     class Lexer
       # A struct containing information about an individual token.
       #
-      # `type`: \[{Symbol}\]
+      # `type`: \[`Symbol`\]
       # : The type of token.
       #
-      # `value`: \[{Object}\]
+      # `value`: \[`Object`\]
       # : The Ruby object corresponding to the value of the token.
       #
-      # `line`: \[{Fixnum}\]
+      # `line`: \[`Fixnum`\]
       # : The line of the source file on which the token appears.
       #
-      # `offset`: \[{Fixnum}\]
+      # `offset`: \[`Fixnum`\]
       # : The number of bytes into the line the SassScript token appeared.
       Token = Struct.new(:type, :value, :line, :offset)