diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index f5e2a5fadbca5..7bf11bec68752 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,3 +1,8 @@
+*2.3.6 (pending)*
+
+* Reset your Active Record counter caches with the reset_counter_cache class method.  #1211 [Mike Breen]
+
+
 *2.3.5 (November 25, 2009)*
 
 * Minor Bug Fixes and deprecation warnings
@@ -6,6 +11,7 @@
 
 * Numerous fixes to the nested attributes functionality
 
+
 *2.3.4 (September 4, 2009)*
 
 * PostgreSQL: XML datatype support.  #1874 [Leonardo Borges]
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 2ec2f73a8508c..7ee26946fe8e5 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -916,6 +916,24 @@ def count_by_sql(sql)
         connection.select_value(sql, "#{name} Count").to_i
       end
 
+      # Reset a counter cache for all records.
+      #
+      # ==== Parameters
+      #
+      # * +association_name+ - The name of of the association counter cache to reset
+      #
+      # ==== Examples
+      #   # For all Post records reset the comments_count
+      #   Post.reset_counter_cache(:comments)
+      def reset_counter_cache(association)
+        child_class = reflect_on_association(association).klass
+        counter_name = child_class.reflect_on_association(self.name.downcase.to_sym).counter_cache_column
+
+        find_each do |object|
+          connection.update("UPDATE #{quoted_table_name} SET #{connection.quote_column_name(counter_name)} = #{object.send(association).count} WHERE #{connection.quote_column_name(primary_key)} = #{quote_value(object.id)}", "#{name} UPDATE")
+        end
+      end
+
       # A generic "counter updater" implementation, intended primarily to be
       # used by increment_counter and decrement_counter, but which may also
       # be useful on its own. It simply does a direct SQL update for the record
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 14f396714d02a..5a4b1906a7a06 100755
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -627,6 +627,16 @@ def test_decrement_counter
     assert_equal -2, Topic.find(2).replies_count
   end
 
+  def test_reset_counter_cache
+    assert_equal 1, Topic.find(1).replies_count
+
+    Topic.increment_counter("replies_count", 1)
+    assert_equal 2, Topic.find(1).replies_count
+
+    Topic.reset_counter_cache(:replies)
+    assert_equal 1, Topic.find(1).replies_count
+  end
+
   def test_update_counter
     category = categories(:general)
     assert_nil category.categorizations_count