diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 8a09af333a924cf443503e17bbbf9bde8f7b3fa1..0587481f605c81931ce8d17c190562320d46faeb 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -4,7 +4,7 @@
 
 * Fixed that send_file/data can work even if render* has been called before in action processing to render the content of a file to be send for example #601
 
-* Added FormOptionsHelper#time_zone_select and FormOptionsHelper#time_zone_options_for_select to work with the new value object TimeZone in Active Record #688 [Jamis Buck]
+* Added FormOptionsHelper#time_zone_select and FormOptionsHelper#time_zone_options_for_select to work with the new value object TimeZone in Active Support #688 [Jamis Buck]
 
 * Added FormHelper#file_field and FormTagHelper#file_field_tag for creating file upload fields
 
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 2bc6f1475c2a7f33a95ac84e914670c3c63fdb99..4177823180204370a66a6658f46b05e4b8754b5a 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -20,8 +20,6 @@
 
   The OCI8 driver can be retrieved from http://rubyforge.org/projects/ruby-oci8/
 
-* Added TimeZone as the first of a number of value objects that Active Record will start shipping to provide incentatives to use rich value objects using composed_of #688 [Jamis Buck]
-
 * Added option :schema_order to the PostgreSQL adapter to support the use of multiple schemas per database #697 [YuriSchimke]
 
 * Optimized the SQL used to generate has_and_belongs_to_many queries by listing the join table first #693 [yerejm]
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index 71f574680b6a550c947aa42d03f1dad8a34c1688..11d327e6a9a0cde911abdb07aa7ed0fcf9293d34 100755
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -47,7 +47,6 @@
 require 'active_record/acts/list'
 require 'active_record/acts/tree'
 require 'active_record/locking'
-require 'active_record/values/time_zone'
 
 ActiveRecord::Base.class_eval do
   include ActiveRecord::Validations
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index 12ed0081511415be1d12f8e04a86942cff320206..d560a7c1de8ef5fbb99baf66af9197026a4d0b21 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,3 +1,5 @@
+* Added TimeZone as the first of a number of value objects that among others Active Record can use rich value objects using composed_of #688 [Jamis Buck]
+
 * Added Date::Conversions for getting dates in different convenient string representations and other objects
 
 * Added Time::Conversions for getting times in different convenient string representations and other objects
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 30034a316ecdaf4c33de9b8774bd35423fdb14dc..11d5c4e1ece9ad0852003f178677cc2b55f43280 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -27,3 +27,5 @@
 require 'active_support/clean_logger'
 require 'active_support/misc'
 require 'active_support/dependencies'
+
+require 'active_support/values/time_zone'
\ No newline at end of file
diff --git a/activerecord/lib/active_record/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
similarity index 100%
rename from activerecord/lib/active_record/values/time_zone.rb
rename to activesupport/lib/active_support/values/time_zone.rb