diff --git a/Gemfile b/Gemfile
index 3080aad..da5b4cf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,6 +4,10 @@ platforms :jruby do
   gem 'jruby-openssl', '~> 0.7'
 end
 
+group :development do
+  gem 'yard', :git => 'https://github.com/lsegal/yard.git'
+end
+
 gemspec :path => 'oa-basic'
 gemspec :path => 'oa-core'
 gemspec :path => 'oa-enterprise'
diff --git a/Rakefile b/Rakefile
index 5323e05..b094175 100644
--- a/Rakefile
+++ b/Rakefile
@@ -47,4 +47,3 @@ namespace :doc do
     task.files = PROJECTS.map{|project| "#{root}/#{project}/lib/**/*.rb"} + ['README.markdown', 'LICENSE']
   end
 end
-
diff --git a/oa-basic/Gemfile b/oa-basic/Gemfile
index 1e01eae..af3f2ef 100644
--- a/oa-basic/Gemfile
+++ b/oa-basic/Gemfile
@@ -4,4 +4,8 @@ platforms :jruby do
   gem 'jruby-openssl', '~> 0.7'
 end
 
+group :development do
+  gem 'yard', :git => 'https://github.com/lsegal/yard.git'
+end
+
 gemspec
diff --git a/oa-basic/oa-basic.gemspec b/oa-basic/oa-basic.gemspec
index 80e374b..276807f 100644
--- a/oa-basic/oa-basic.gemspec
+++ b/oa-basic/oa-basic.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake', '~> 0.8'
   gem.add_development_dependency 'rspec', '~> 2.5'
   gem.add_development_dependency 'webmock', '~> 1.6'
-  gem.add_development_dependency 'yard', '~> 0.6'
+  # gem.add_development_dependency 'yard', '~> 0.7'
   gem.add_development_dependency 'ZenTest', '~> 4.5'
   gem.name = 'oa-basic'
   gem.version = OmniAuth::Version::STRING
diff --git a/oa-core/Gemfile b/oa-core/Gemfile
index d65e2a6..3c1dac6 100644
--- a/oa-core/Gemfile
+++ b/oa-core/Gemfile
@@ -1,3 +1,7 @@
 source 'http://rubygems.org'
 
+group :development do
+  gem 'yard', :git => 'https://github.com/lsegal/yard.git'
+end
+
 gemspec
diff --git a/oa-core/oa-core.gemspec b/oa-core/oa-core.gemspec
index 82f7620..21be5b1 100644
--- a/oa-core/oa-core.gemspec
+++ b/oa-core/oa-core.gemspec
@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rack-test', '~> 0.5'
   gem.add_development_dependency 'rake', '~> 0.8'
   gem.add_development_dependency 'rspec', '~> 2.5'
-  gem.add_development_dependency 'yard', '~> 0.6'
+  # gem.add_development_dependency 'yard', '~> 0.7'
   gem.add_development_dependency 'ZenTest', '~> 4.5'
   gem.name = 'oa-core'
   gem.version = OmniAuth::Version::STRING
diff --git a/oa-enterprise/Gemfile b/oa-enterprise/Gemfile
index 1e01eae..af3f2ef 100644
--- a/oa-enterprise/Gemfile
+++ b/oa-enterprise/Gemfile
@@ -4,4 +4,8 @@ platforms :jruby do
   gem 'jruby-openssl', '~> 0.7'
 end
 
+group :development do
+  gem 'yard', :git => 'https://github.com/lsegal/yard.git'
+end
+
 gemspec
diff --git a/oa-enterprise/oa-enterprise.gemspec b/oa-enterprise/oa-enterprise.gemspec
index e5727a5..5fefc70 100644
--- a/oa-enterprise/oa-enterprise.gemspec
+++ b/oa-enterprise/oa-enterprise.gemspec
@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake', '~> 0.8'
   gem.add_development_dependency 'rspec', '~> 2.5'
   gem.add_development_dependency 'webmock', '~> 1.6'
-  gem.add_development_dependency 'yard', '~> 0.6'
+  # gem.add_development_dependency 'yard', '~> 0.7'
   gem.add_development_dependency 'ZenTest', '~> 4.5'
   gem.name = 'oa-enterprise'
   gem.version = OmniAuth::Version::STRING
diff --git a/oa-more/Gemfile b/oa-more/Gemfile
index 1e01eae..af3f2ef 100644
--- a/oa-more/Gemfile
+++ b/oa-more/Gemfile
@@ -4,4 +4,8 @@ platforms :jruby do
   gem 'jruby-openssl', '~> 0.7'
 end
 
+group :development do
+  gem 'yard', :git => 'https://github.com/lsegal/yard.git'
+end
+
 gemspec
diff --git a/oa-more/oa-more.gemspec b/oa-more/oa-more.gemspec
index 292a405..d617cc9 100644
--- a/oa-more/oa-more.gemspec
+++ b/oa-more/oa-more.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec', '~> 2.5'
   gem.add_development_dependency 'simplecov', '~> 0.4'
   gem.add_development_dependency 'webmock', '~> 1.6'
-  gem.add_development_dependency 'yard', '~> 0.6'
+  # gem.add_development_dependency 'yard', '~> 0.7'
   gem.add_development_dependency 'ZenTest', '~> 4.5'
   gem.name = 'oa-more'
   gem.version = OmniAuth::Version::STRING
diff --git a/oa-oauth/Gemfile b/oa-oauth/Gemfile
index 1e01eae..af3f2ef 100644
--- a/oa-oauth/Gemfile
+++ b/oa-oauth/Gemfile
@@ -4,4 +4,8 @@ platforms :jruby do
   gem 'jruby-openssl', '~> 0.7'
 end
 
+group :development do
+  gem 'yard', :git => 'https://github.com/lsegal/yard.git'
+end
+
 gemspec
diff --git a/oa-oauth/oa-oauth.gemspec b/oa-oauth/oa-oauth.gemspec
index e1989c3..0e0f3d8 100644
--- a/oa-oauth/oa-oauth.gemspec
+++ b/oa-oauth/oa-oauth.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec', '~> 2.5'
   gem.add_development_dependency 'simplecov', '~> 0.4'
   gem.add_development_dependency 'webmock', '~> 1.6'
-  gem.add_development_dependency 'yard', '~> 0.6'
+  # gem.add_development_dependency 'yard', '~> 0.7'
   gem.add_development_dependency 'ZenTest', '~> 4.5'
   gem.name = 'oa-oauth'
   gem.version = OmniAuth::Version::STRING
diff --git a/oa-openid/Gemfile b/oa-openid/Gemfile
index 1e01eae..af3f2ef 100644
--- a/oa-openid/Gemfile
+++ b/oa-openid/Gemfile
@@ -4,4 +4,8 @@ platforms :jruby do
   gem 'jruby-openssl', '~> 0.7'
 end
 
+group :development do
+  gem 'yard', :git => 'https://github.com/lsegal/yard.git'
+end
+
 gemspec
diff --git a/oa-openid/oa-openid.gemspec b/oa-openid/oa-openid.gemspec
index 8eaba6d..3864527 100644
--- a/oa-openid/oa-openid.gemspec
+++ b/oa-openid/oa-openid.gemspec
@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec', '~> 2.5'
   gem.add_development_dependency 'simplecov', '~> 0.4'
   gem.add_development_dependency 'webmock', '~> 1.6'
-  gem.add_development_dependency 'yard', '~> 0.6'
+  # gem.add_development_dependency 'yard', '~> 0.7'
   gem.add_development_dependency 'ZenTest', '~> 4.5'
   gem.name = 'oa-openid'
   gem.version = OmniAuth::Version::STRING