diff --git a/.gitignore b/.gitignore
index 863517ce..e5461d2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.gem
 coverage
+doc
 pkg
 rdoc
 test/active_record.log
diff --git a/.yardopts b/.yardopts
new file mode 100644
index 00000000..3f130edf
--- /dev/null
+++ b/.yardopts
@@ -0,0 +1,5 @@
+--title "state_machine"
+--readme README.rdoc
+-
+CHANGELOG.rdoc
+LICENSE
diff --git a/Rakefile b/Rakefile
index 346a5bc5..5175d696 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,7 +4,6 @@ require 'appraisal'
 
 require 'rake'
 require 'rake/testtask'
-require 'rdoc/task'
 
 desc 'Default: run all tests.'
 task :default => :test
@@ -34,14 +33,6 @@ begin
 rescue LoadError
 end
 
-desc "Generate documentation for state_machine."
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'state_machine'
-  rdoc.options << '--line-numbers' << '--inline-source' << '--main=README.rdoc'
-  rdoc.rdoc_files.include('README.rdoc', 'CHANGELOG.rdoc', 'LICENSE', 'lib/**/*.rb')
-end
-
 namespace :appraisal do
   desc "Run the given task for a particular integration's appraisals"
   task :integration do
diff --git a/state_machine.gemspec b/state_machine.gemspec
index a3c73cea..695807ac 100644
--- a/state_machine.gemspec
+++ b/state_machine.gemspec
@@ -17,6 +17,5 @@ Gem::Specification.new do |s|
   
   s.add_development_dependency("rake")
   s.add_development_dependency("ruby-graphviz")
-  s.add_development_dependency("rdoc")
   s.add_development_dependency("appraisal")
 end