diff --git a/Gemfile b/Gemfile
index 9e5ff871..456ac022 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,12 +7,6 @@ gem "webrat", "0.7.1"
 gem "mocha", :require => false
 gem "oauth2"
 
-if File.exist?("../orm_adapter")
-  gem "orm_adapter", :path => "../orm_adapter"
-else
-  gem "orm_adapter", :git => "http://github.com/ianwhite/orm_adapter.git"
-end
-
 platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index d87277f0..73818d08 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,13 +3,9 @@ PATH
   specs:
     devise (1.2.rc)
       bcrypt-ruby (~> 2.1.2)
+      orm_adapter (~> 0.0.2)
       warden (~> 1.0.0)
 
-PATH
-  remote: /Users/jose/Work/github/orm_adapter
-  specs:
-    orm_adapter (0.0.1)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -80,6 +76,7 @@ GEM
     oauth2 (0.0.13)
       faraday (~> 0.4.1)
       multi_json (>= 0.0.4)
+    orm_adapter (0.0.2)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
@@ -131,7 +128,7 @@ DEPENDENCIES
   mongo (= 1.0.7)
   mongoid (= 2.0.0.beta.18)
   oauth2
-  orm_adapter!
+  orm_adapter (~> 0.0.2)
   rails (= 3.0.0)
   ruby-debug (>= 0.10.3)
   sqlite3-ruby
diff --git a/Rakefile b/Rakefile
index 57df07b4..39b27237 100644
--- a/Rakefile
+++ b/Rakefile
@@ -47,6 +47,7 @@ begin
     s.files =  root_files + FileList["{app,config,lib}/**/*"]
     s.extra_rdoc_files = root_files
     s.add_dependency("warden", "~> 1.0.0")
+    s.add_dependency("orm_adapter", "~> 0.0.2")
     s.add_dependency("bcrypt-ruby", "~> 2.1.2")
   end
 
diff --git a/devise.gemspec b/devise.gemspec
index af19e344..8c649379 100644
--- a/devise.gemspec
+++ b/devise.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jos\303\251 Valim", "Carlos Ant\303\264nio"]
-  s.date = %q{2010-09-27}
+  s.date = %q{2010-10-10}
   s.description = %q{Flexible authentication solution for Rails with Warden}
   s.email = %q{contact@plataformatec.com.br}
   s.extra_rdoc_files = [
@@ -192,13 +192,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<warden>, ["~> 1.0.0"])
+      s.add_runtime_dependency(%q<orm_adapter>, ["~> 0.0.2"])
       s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
     else
       s.add_dependency(%q<warden>, ["~> 1.0.0"])
+      s.add_dependency(%q<orm_adapter>, ["~> 0.0.2"])
       s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
     end
   else
     s.add_dependency(%q<warden>, ["~> 1.0.0"])
+    s.add_dependency(%q<orm_adapter>, ["~> 0.0.2"])
     s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
   end
 end