diff --git a/Rakefile b/Rakefile
index 6e909d5..e1dd0d6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -8,9 +8,14 @@ end
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "rake/clean"
+require "yard"
 
 CLEAN.include 'build_tests_run'
 
 RSpec::Core::RakeTask.new(:spec)
 
+YARD::Rake::YardocTask.new do |yard|
+  yard.files = ['lib/**/*.rb']
+end
+
 task :default => :spec
diff --git a/rscons.gemspec b/rscons.gemspec
index 5a82548..72a490f 100644
--- a/rscons.gemspec
+++ b/rscons.gemspec
@@ -25,4 +25,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "simplecov"
   gem.add_development_dependency "json"
   gem.add_development_dependency 'rdoc'
+  gem.add_development_dependency "yard"
 end