diff --git a/lib/tasks/plugins.rake b/lib/tasks/plugins.rake
index 94bb6c2..0ff387f 100644
--- a/lib/tasks/plugins.rake
+++ b/lib/tasks/plugins.rake
@@ -1,28 +1,23 @@
+require 'active_record'
+require_dependency 'active_record/migration'
+
+class ActiveRecord::Migrator
+  alias_method :orig_initialize, :initialize
+  def initialize *args
+    orig_initialize *args
+    @migrations_path = "{db/migrate,config/plugins/*/db/migrate}"
+  end
+end
+
 namespace :noosfero do
   namespace :plugins do
-    plugin_migration_dirs = Dir.glob(File.join(Rails.root, 'config', 'plugins', '*', 'db', 'migrate'))
+    plugin_migration_dirs = Dir.glob(File.join(Rails.root, 'config',
+                                               'plugins', '*', 'db', 'migrate'))
     task :migrate do
       plugin_migration_dirs.each do |path|
-        ActiveRecord::Migrator.migrate(path, ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
-      end
-    end
-    task :abort_if_pending_migrations do
-      if defined? ActiveRecord
-        pending_migrations = plugin_migration_dirs.map do |path|
-          ActiveRecord::Migrator.new(:up, path).pending_migrations
-        end.flatten
-
-        if pending_migrations.any?
-          puts "You have #{pending_migrations.size} pending migrations:"
-          pending_migrations.each do |pending_migration|
-            puts '  %4d %s' % [pending_migration.version, pending_migration.name]
-          end
-          abort %{Run "rake db:migrate" to update your database then try again.}
-        end
+        ActiveRecord::Migrator.migrate(path, ENV["VERSION"] ?
+                                       ENV["VERSION"].to_i : nil)
       end
     end
   end
 end
-
-task 'db:migrate' => 'noosfero:plugins:migrate'
-task 'db:abort_if_pending_migrations' => 'noosfero:plugins:abort_if_pending_migrations'
--
libgit2 0.21.2