diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index f540aa7f25..9663a36edf 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1498,6 +1498,7 @@ def add_touch_callbacks(reflection, touch_attribute)
             end
           end
           after_save(method_name)
+          after_touch(method_name)
           after_destroy(method_name)
         end
 
diff --git a/activerecord/lib/active_record/callbacks.rb b/activerecord/lib/active_record/callbacks.rb
index 637dac450b..82c45a41b0 100644
--- a/activerecord/lib/active_record/callbacks.rb
+++ b/activerecord/lib/active_record/callbacks.rb
@@ -228,7 +228,7 @@ module Callbacks
     extend ActiveSupport::Concern
 
     CALLBACKS = [
-      :after_initialize, :after_find, :before_validation, :after_validation,
+      :after_initialize, :after_find, :after_touch, :before_validation, :after_validation,
       :before_save, :around_save, :after_save, :before_create, :around_create,
       :after_create, :before_update, :around_update, :after_update,
       :before_destroy, :around_destroy, :after_destroy
@@ -238,7 +238,7 @@ module Callbacks
       extend ActiveModel::Callbacks
       include ActiveModel::Validations::Callbacks
 
-      define_model_callbacks :initialize, :find, :only => :after
+      define_model_callbacks :initialize, :find, :touch, :only => :after
       define_model_callbacks :save, :create, :update, :destroy
     end
 
@@ -256,6 +256,10 @@ def destroy #:nodoc:
       _run_destroy_callbacks { super }
     end
 
+    def touch(*) #:nodoc:
+      _run_touch_callbacks { super }
+    end
+
     def deprecated_callback_method(symbol) #:nodoc:
       if respond_to?(symbol, true)
         ActiveSupport::Deprecation.warn("Overwriting #{symbol} in your models has been deprecated, please use Base##{symbol} :method_name instead")
diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb
index 38b91652ee..cbc2220e96 100644
--- a/activerecord/lib/active_record/persistence.rb
+++ b/activerecord/lib/active_record/persistence.rb
@@ -218,6 +218,19 @@ def reload(options = nil)
       self
     end
 
+    # Saves the record with the updated_at/on attributes set to the current time.
+    # Please note that no validation is performed and no callbacks are executed.
+    # If an attribute name is passed, that attribute is updated along with 
+    # updated_at/on attributes.
+    #
+    # Examples:
+    #
+    #   product.touch               # updates updated_at/on
+    #   product.touch(:designed_at) # updates the designed_at attribute and updated_at/on
+    def touch(attribute = nil)
+      update_attribute(attribute, current_time_from_proper_timezone)
+    end
+
   private
     def create_or_update
       raise ReadOnlyRecord if readonly?
diff --git a/activerecord/lib/active_record/timestamp.rb b/activerecord/lib/active_record/timestamp.rb
index 92f7a7753d..32b3f03f13 100644
--- a/activerecord/lib/active_record/timestamp.rb
+++ b/activerecord/lib/active_record/timestamp.rb
@@ -31,19 +31,6 @@ module Timestamp
       class_inheritable_accessor :record_timestamps, :instance_writer => false
       self.record_timestamps = true
     end
-    
-    # Saves the record with the updated_at/on attributes set to the current time.
-    # Please note that no validation is performed and no callbacks are executed.
-    # If an attribute name is passed, that attribute is updated along with 
-    # updated_at/on attributes.
-    #
-    # Examples:
-    #
-    #   product.touch               # updates updated_at/on
-    #   product.touch(:designed_at) # updates the designed_at attribute and updated_at/on
-    def touch(attribute = nil)
-      update_attribute(attribute, current_time_from_proper_timezone)
-    end
 
   private
 
diff --git a/activerecord/test/cases/timestamp_test.rb b/activerecord/test/cases/timestamp_test.rb
index e3d12f6214..06ab7aa9c7 100644
--- a/activerecord/test/cases/timestamp_test.rb
+++ b/activerecord/test/cases/timestamp_test.rb
@@ -2,9 +2,10 @@
 require 'models/developer'
 require 'models/owner'
 require 'models/pet'
+require 'models/toy'
 
 class TimestampTest < ActiveRecord::TestCase
-  fixtures :developers, :owners, :pets
+  fixtures :developers, :owners, :pets, :toys
 
   def setup
     @developer = Developer.first
@@ -91,11 +92,10 @@ def test_touching_a_record_touches_parent_record_and_grandparent_record
     pet = toy.pet
     owner = pet.owner
 
-    previously_owner_updated_at = owner.updated_at
-
+    owner.update_attribute(:updated_at, (time = 3.days.ago))
     toy.touch
 
-    assert_not_equal previously_owner_updated_at, owner.updated_at
+    assert_not_equal time, owner.updated_at
   ensure
     Toy.belongs_to :pet
   end