diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index bbbac02af1..d80d3a7c86 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,6 +1,6 @@
 *CVS*
 
-* Added acts_as_list that can decorates an existing class with methods like move_higher/lower, move_to_top/bottom. Example:
+* Added acts_as_list that can decorates an existing class with methods like move_higher/lower, move_to_top/bottom. [Tobias Luetke] Example:
 
     class TodoItem < ActiveRecord::Base
       acts_as_list :scope => :todo_list_id
@@ -8,7 +8,7 @@
     end
 
 * Added acts_as_tree that can decorates an existing class with a many to many relationship with itself. Perfect for categories in 
-  categories and the likes.
+  categories and the likes. [Tobias Luetke]
 
 * Added that Active Records will automatically record creation and/or update timestamps of database objects if fields of the names 
   created_at/created_on or updated_at/updated_on are present. [Tobias Luetke]
diff --git a/activerecord/lib/active_record/timestamp.rb b/activerecord/lib/active_record/timestamp.rb
new file mode 100644
index 0000000000..149113b950
--- /dev/null
+++ b/activerecord/lib/active_record/timestamp.rb
@@ -0,0 +1,22 @@
+module ActiveRecord
+  # Active Records will automatically record creation and/or update timestamps of database objects
+  # if fields of the names created_at/created_on or updated_at/updated_on are present.
+  module Timestamp 
+    def self.append_features(base) # :nodoc:
+      super
+      base.before_create :timestamp_before_create
+      base.before_update :timestamp_before_update
+    end    
+      
+    def timestamp_before_create
+      write_attribute("created_at", Time.now) if respond_to?(:created_at) && created_at.nil?
+      write_attribute("created_on", Time.now) if respond_to?(:created_on) && created_on.nil?
+      timestamp_before_update
+    end
+
+    def timestamp_before_update
+      write_attribute("updated_at", Time.now) if respond_to?(:updated_at)
+      write_attribute("updated_on", Time.now) if respond_to?(:updated_on)
+    end
+  end 
+end
\ No newline at end of file