diff --git a/.hgignore b/.hgignore
index ad0d873..847a987 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,2 +1,5 @@
-^coverage$
-^rdoc$
+^coverage$
+^rdoc$
+^doc$
+.yardoc$
+syntax: glob
diff --git a/Rakefile b/Rakefile
index c693aeb..b6e3840 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,24 +1,19 @@
 require 'rake'
 require 'rake/testtask'
-require 'rdoc/task'
+require 'yard'
 
 desc 'Default: run unit tests.'
 task :default => :test
 
-desc 'Test the redmine_issue_templates plugin.'
+desc 'Test the redmine_banner plugin.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
 
-desc 'Generate documentation for the redmine_issue_templates plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Redmine Issue Templates'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('app/**/*.rb')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-  rdoc.options = ["--charset", "utf-8"] 
-end
+YARD::Rake::YardocTask.new(:yardoc) do |t|
+  files = ['lib/**/*.rb', 'app/**/*.rb'] #exclude test file
+  t.files = files
+  t.options += ['--output-dir', './doc']
+end
\ No newline at end of file