diff --git a/.gitignore b/.gitignore
index 588dff30..9b49d33a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .bundle/
+doc/
 pkg
 nbproject
diff --git a/Rakefile b/Rakefile
index 7ca833be..c31ed835 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,5 @@
 require 'bundler'
+require 'rake/rdoctask'
 Bundler::GemHelper.install_tasks
 
 $LOAD_PATH.unshift 'lib'
@@ -11,3 +12,10 @@ task :test do
     require File.expand_path(f)
   end
 end
+
+Rake::RDocTask.new do |rd|
+  rd.main = "README.markdown"
+  rd.rdoc_files.include("README.markdown", "lib/**/*.rb")
+  rd.rdoc_dir = 'doc'
+end
+