diff --git a/FatZebra.gemspec b/FatZebra.gemspec
index 54a74c5..9e69176 100644
--- a/FatZebra.gemspec
+++ b/FatZebra.gemspec
@@ -21,5 +21,10 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   s.add_development_dependency "rspec"
   s.add_development_dependency "rake"
+  s.add_development_dependency "yard"
+  s.add_development_dependency "yard-tomdoc"
+  
+
   s.add_runtime_dependency "rest-client"
+  s.add_runtime_dependency "json"
 end
diff --git a/Rakefile b/Rakefile
index 348c5b9..5f1e21a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -5,4 +5,14 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new('spec')
 
 # If you want to make this the default task
-task :default => :spec
\ No newline at end of file
+task :default => :spec
+
+begin
+	require 'yard'
+	desc "Run the YARDdoc task"
+	task :yard do
+		exec "yardoc --plugin yard-tomdoc"
+	end
+rescue LoadError
+	puts "Please install the Yard gem to create docs"
+end