diff --git a/Rakefile b/Rakefile
index 706e201e..c1bef62e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -145,9 +145,12 @@ begin
       list.exclude('TODO')
     end.to_a.join(',')
   end
+  Rake::Task['yardoc'].instance_variable_set('@comment', nil)
 
+  desc "Generate Documentation"
   task :doc => :yardoc
 rescue LoadError
+  desc "Generate Documentation"
   task :doc => :rdoc
   task :yardoc => :rdoc
 end