diff --git a/activerecord/lib/active_record/timestamp.rb b/activerecord/lib/active_record/timestamp.rb
index a9e0efa6fe40bff3a82d980fd1e3182fcd9dbc7f..8dbe80a01ac4416540b5de9aa1b0b7ef154c36a2 100644
--- a/activerecord/lib/active_record/timestamp.rb
+++ b/activerecord/lib/active_record/timestamp.rb
@@ -23,8 +23,8 @@ def create_with_timestamps #:nodoc:
           write_attribute('created_at', t) if respond_to?(:created_at) && created_at.nil?
           write_attribute('created_on', t) if respond_to?(:created_on) && created_on.nil?
 
-          write_attribute('updated_at', t) if respond_to?(:updated_at)
-          write_attribute('updated_on', t) if respond_to?(:updated_on)
+          write_attribute('updated_at', t) if respond_to?(:updated_at) && updated_at.nil?
+          write_attribute('updated_on', t) if respond_to?(:updated_on) && updated_on.nil?
         end
         create_without_timestamps
       end
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 5f54931d0044dbba1fc0134ed649fb8bdc819e49..ce77ba4dbf0d91db7a2770620eea72f0519706bc 100755
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -16,6 +16,7 @@
 require 'models/comment'
 require 'models/minimalistic'
 require 'models/warehouse_thing'
+require 'models/parrot'
 require 'rexml/document'
 
 class Category < ActiveRecord::Base; end
@@ -2071,6 +2072,15 @@ def test_benchmark_with_use_silence
     ActiveRecord::Base.logger = original_logger
   end
 
+  def test_create_with_custom_timestamps
+    custom_datetime = 1.hour.ago.beginning_of_day
+
+    %w(created_at created_on updated_at updated_on).each do |attribute|
+      parrot = LiveParrot.create(:name => "colombian", attribute => custom_datetime)
+      assert_equal custom_datetime, parrot[attribute]
+    end
+  end
+
   private
     def with_kcode(kcode)
       if RUBY_VERSION < '1.9'