diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 57af4ee6a49e7..da5d5c4086b2b 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,14 +1,66 @@
+## Rails 4.0.0 (unreleased) ##
+
+*   No changes
+
+
+## Rails 3.2.1 (January 26, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.2.0 (January 20, 2012) ##
+
+*   Upgrade mail version to 2.4.0 *ML*
+
+*   Remove Old ActionMailer API *Josh Kalderimis*
+
+
+## Rails 3.1.3 (November 20, 2011) ##
+
+*   No changes
+
+
+## Rails 3.1.2 (November 18, 2011) ##
+
+*   No changes
+
+
+## Rails 3.1.1 (October 7, 2011) ##
+
+*   No changes
+
+
 ## Rails 3.1.0 (August 30, 2011) ##
 
 *   No changes
 
 
+## Rails 3.0.11 (November 18, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.10 (August 16, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.9 (June 16, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.8 (June 7, 2011) ##
+
+*   Mail dependency increased to 2.2.19
+
+
 ## Rails 3.0.7 (April 18, 2011) ##
 
 *   remove AM delegating register_observer and register_interceptor to Mail *Josh Kalderimis*
 
 
-*   Rails 3.0.6 (April 5, 2011)
+## Rails 3.0.6 (April 5, 2011) ##
 
 *   Don't allow i18n to change the minor version, version now set to ~> 0.5.0 *Santiago Pastorino*
 
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 6c56a373406bc..74a8d9f78af5d 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -110,6 +110,29 @@
 *    `ActionView::Helpers::TextHelper#highlight` now defaults to the
      HTML5 `mark` element. *Brian Cardarella*
 
+
+## Rails 3.2.2 (unreleased) ##
+
+*   Format lookup for partials is derived from the format in which the template is being rendered. Closes #5025 part 2 *Santiago Pastorino*
+
+*   Use the right format when a partial is missing. Closes #5025. *Santiago Pastorino*
+
+*   Default responder will now always use your overridden block in `respond_with` to render your response. *Prem Sichanugrist*
+
+*   check_box helper with :disabled => true will generate a disabled hidden field to conform with the HTML convention where disabled fields are not submitted with the form.
+    This is a behavior change, previously the hidden tag had a value of the disabled checkbox.
+    *Tadas Tamosauskas*
+
+
+## Rails 3.2.1 (January 26, 2012) ##
+
+*   Documentation improvements.
+
+*   Allow `form.select` to accept ranges (regression). *Jeremy Walker*
+
+*   `datetime_select` works with -/+ infinity dates. *Joe Van Dyk*
+
+
 ## Rails 3.2.0 (January 20, 2012) ##
 
 *   Add `config.action_dispatch.default_charset` to configure default charset for ActionDispatch::Response. *Carlos Antonio da Silva*
@@ -280,14 +303,24 @@
 
 ## Rails 3.1.4 (unreleased) ##
 
+*   Skip assets group in Gemfile and all assets configurations options
+    when the application is generated with --skip-sprockets option.
+
+    *Guillermo Iguaran*
+
+*   Use ProcessedAsset#pathname in Sprockets helpers when debugging is on. Closes #3333 #3348 #3361.
+
+    *Guillermo Iguaran*
+
 *   Allow to use asset_path on named_routes aliasing RailsHelper's
     asset_path to path_to_asset *Adrian Pike*
 
-*   Assets should use the request protocol by default or default to
-    relative if no request is available *Jonathan del Strother*
+*   Assets should use the request protocol by default or default to relative if no request is available *Jonathan del Strother*
 
 ## Rails 3.1.3 (November 20, 2011) ##
 
+*   Downgrade sprockets to ~> 2.0.3. Using 2.1.0 caused regressions.
+
 *   Fix using `translate` helper with a html translation which uses the `:count` option for
     pluralization.
 
@@ -570,6 +603,96 @@
 *   Add Rack::Cache to the default stack. Create a Rails store that delegates to the Rails cache, so by default, whatever caching layer you are using will be used for HTTP caching. Note that Rack::Cache will be used if you use #expires_in, #fresh_when or #stale with :public => true. Otherwise, the caching rules will apply to the browser only. *Yehuda Katz, Carl Lerche*
 
 
+## Rails 3.0.12 (unreleased) ##
+
+* Fix using `tranlate` helper with a html translation which uses the `:count` option for
+  pluralization.
+
+  *Jon Leighton*
+
+
+## Rails 3.0.11 (November 18, 2011) ##
+
+*   Fix XSS security vulnerability in the `translate` helper method. When using interpolation
+    in combination with HTML-safe translations, the interpolated input would not get HTML
+    escaped. *GH 3664*
+
+    Before:
+
+      translate('foo_html', :something => '<script>') # => "...<script>..."
+
+    After:
+
+      translate('foo_html', :something => '<script>') # => "...&lt;script&gt;..."
+
+    *Sergey Nartimov*
+
+*   Implement a workaround for a bug in ruby-1.9.3p0 where an error would be
+    raised while attempting to convert a template from one encoding to another.
+
+    Please see http://redmine.ruby-lang.org/issues/5564 for details of the bug.
+
+    The workaround is to load all conversions into memory ahead of time, and will
+    only happen if the ruby version is exactly 1.9.3p0. The hope is obviously
+    that the underlying problem will be resolved in the next patchlevel release
+    of 1.9.3.
+
+*   Fix assert_select_email to work on multipart and non-multipart emails as the method stopped working correctly in Rails 3.x due to changes in the new mail gem.
+
+*   Fix url_for when passed a hash to prevent additional options (eg. :host, :protocol) from being added to the hash after calling it.
+
+
+## Rails 3.0.10 (August 16, 2011) ##
+
+*   Fixes an issue where cache sweepers with only after filters would have no
+    controller object, it would raise undefined method controller_name for nil [jeroenj]
+
+*   Ensure status codes are logged when exceptions are raised.
+
+*   Subclasses of OutputBuffer are respected.
+
+*   Fixed ActionView::FormOptionsHelper#select with :multiple => false
+
+*   Avoid extra call to Cache#read in case of a fragment cache hit
+
+
+## Rails 3.0.9 (June 16, 2011) ##
+
+*   json_escape will now return a SafeBuffer string if it receives SafeBuffer string [tenderlove]
+
+*   Make sure escape_js returns SafeBuffer string if it receives SafeBuffer string [Prem Sichanugrist]
+
+*   Fix text helpers to work correctly with the new SafeBuffer restriction [Paul Gallagher, Arun Agrawal, Prem Sichanugrist]
+
+
+## Rails 3.0.8 (June 7, 2011) ##
+
+*   It is prohibited to perform a in-place SafeBuffer mutation [tenderlove]
+
+    The old behavior of SafeBuffer allowed you to mutate string in place via
+    method like `sub!`. These methods can add unsafe strings to a safe buffer,
+    and the safe buffer will continue to be marked as safe.
+
+    An example problem would be something like this:
+
+      <%= link_to('hello world', @user).sub!(/hello/, params[:xss])  %>
+
+    In the above example, an untrusted string (`params[:xss]`) is added to the
+    safe buffer returned by `link_to`, and the untrusted content is successfully
+    sent to the client without being escaped.  To prevent this from happening
+    `sub!` and other similar methods will now raise an exception when they are called on a safe buffer.
+
+    In addition to the in-place versions, some of the versions of these methods which return a copy of the string will incorrectly mark strings as safe. For example:
+
+       <%= link_to('hello world', @user).sub(/hello/, params[:xss]) %>
+
+    The new versions will now ensure that *all* strings returned by these methods on safe buffers are marked unsafe.
+
+    You can read more about this change in http://groups.google.com/group/rubyonrails-security/browse_thread/thread/2e516e7acc96c4fb
+
+*   Fixed github issue #342 with asset paths and relative roots.
+
+
 ## Rails 3.0.7 (April 18, 2011) ##
 
 *   No changes.
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index e4779c90d802d..0d70edd0ba69f 100644
--- a/activemodel/CHANGELOG.md
+++ b/activemodel/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 *   Trim down Active Model API by removing `valid?` and `errors.full_messages` *José Valim*
 
+## Rails 3.2.1 (January 26, 2012) ##
+
+*   No changes.
+
 ## Rails 3.2.0 (January 20, 2012) ##
 
 *   Deprecated `define_attr_method` in `ActiveModel::AttributeMethods`, because this only existed to
@@ -17,6 +21,23 @@
 
 *   Provide mass_assignment_sanitizer as an easy API to replace the sanitizer behavior. Also support both :logger (default) and :strict sanitizer behavior *Bogdan Gusiev*
 
+## Rails 3.1.3 (November 20, 2011) ##
+
+*   No changes
+
+## Rails 3.1.2 (November 18, 2011) ##
+
+*   No changes
+
+## Rails 3.1.1 (October 7, 2011) ##
+
+*   Remove hard dependency on bcrypt-ruby to avoid make ActiveModel dependent on a binary library.
+    You must add the gem explicitly to your Gemfile if you want use ActiveModel::SecurePassword:
+
+    gem 'bcrypt-ruby', '~> 3.0.0'
+
+    See GH #2687. *Guillermo Iguaran*
+
 ## Rails 3.1.0 (August 30, 2011) ##
 
 *   Alternate I18n namespace lookup is no longer supported.
@@ -40,12 +61,37 @@
 *   Add support for selectively enabling/disabling observers *Myron Marston*
 
 
+## Rails 3.0.12 (unreleased) ##
+
+*   No changes.
+
+
+## Rails 3.0.11 (November 18, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.10 (August 16, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.9 (June 16, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.8 (June 7, 2011) ##
+
+*   No changes.
+
+
 ## Rails 3.0.7 (April 18, 2011) ##
 
 *   No changes.
 
 
-*   Rails 3.0.6 (April 5, 2011)
+##   Rails 3.0.6 (April 5, 2011) ##
 
 *   Fix when database column name has some symbolic characters (e.g. Oracle CASE# VARCHAR2(20)) #5818 #6850 *Robert Pankowecki, Santiago Pastorino*
 
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index f69f8035131a4..cea50aaa9d2a8 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -134,8 +134,11 @@
 
 *   The threshold for auto EXPLAIN is ignored if there's no logger. *fxn*
 
+*   Call `to_s` on the value passed to `table_name=`, in particular symbols
+    are supported (regression). *Sergey Nartimov*
+
 *   Fix possible race condition when two threads try to define attribute
-    methods for the same class.
+    methods for the same class. *Jon Leighton*
 
 
 ## Rails 3.2.0 (January 20, 2012) ##
@@ -317,7 +320,34 @@
 
     *Aaron Christy*
 
-## Rails 3.1.3 (November 20, 2011) ##
+ ## Rails 3.1.4 (unreleased) ##
+
+ *   Fix a custom primary key regression *GH 3987*
+
+     *Jon Leighton*
+
+ *   Perf fix (second try): don't load records for `has many :dependent =>
+     :delete_all` *GH 3672*
+
+     *Jon Leighton*
+
+ *   Fix accessing `proxy_association` method from an association extension
+     where the calls are chained. *GH #3890*
+
+     (E.g. `post.comments.where(bla).my_proxy_method`)
+
+     *Jon Leighton*
+
+ *   Perf fix: MySQL primary key lookup was still slow for very large
+     tables. *GH 3678*
+
+     *Kenny J*
+
+ *   Perf fix: If a table has no primary key, don't repeatedly ask the database for it.
+
+     *Julius de Bruijn*
+
+### Rails 3.1.3 (November 20, 2011) ##
 
 *   Perf fix: If we're deleting all records in an association, don't add a IN(..) clause
     to the query. *GH 3672*
@@ -330,7 +360,7 @@
 
     *Christos Zisopoulos and Kenny J*
 
-## Rails 3.1.2 (November 18, 2011) ##
+### Rails 3.1.2 (November 18, 2011) ##
 
 *   Fix bug with PostgreSQLAdapter#indexes. When the search path has multiple schemas, spaces
     were not being stripped from the schema names after the first.
@@ -749,6 +779,58 @@
     *Aaron Patterson*
 
 
+## Rails 3.0.12 (unreleased) ##
+
+*   No changes.
+
+
+## Rails 3.0.11 (November 18, 2011) ##
+
+*   Exceptions from database adapters should not lose their backtrace.
+
+*   Backport "ActiveRecord::Persistence#touch should not use default_scope" (GH #1519)
+
+*   Psych errors with poor yaml formatting are proxied. Fixes GH #2645 and
+    GH #2731
+
+*   Fix ActiveRecord#exists? when passsed a nil value
+
+
+## Rails 3.0.10 (August 16, 2011) ##
+
+*   Magic encoding comment added to schema.rb files
+
+*   schema.rb is written as UTF-8 by default.
+
+*   Ensuring an established connection when running `rake db:schema:dump`
+
+*   Association conditions will not clobber join conditions.
+
+*   Destroying a record will destroy the HABTM record before destroying itself.
+    GH #402.
+
+*   Make `ActiveRecord::Batches#find_each` to not return `self`.
+
+*   Update `table_exists?` in PG to to always use current search_path or schema if explictly set.
+
+
+## Rails 3.0.9 (June 16, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.8 (June 7, 2011) ##
+
+*   Fix various problems with using :primary_key and :foreign_key options in conjunction with
+  :through associations. [Jon Leighton]
+
+*   Correctly handle inner joins on polymorphic relationships.
+
+*   Fixed infinity and negative infinity cases in PG date columns.
+
+*   Creating records with invalid associations via `create` or `save` will no longer raise exceptions.
+
+
 ## Rails 3.0.7 (April 18, 2011) ##
 
 *   Destroying records via nested attributes works independent of reject_if LH #6006 *Durran Jordan*
diff --git a/activeresource/CHANGELOG.md b/activeresource/CHANGELOG.md
index 3634f75979db0..e092621a33342 100644
--- a/activeresource/CHANGELOG.md
+++ b/activeresource/CHANGELOG.md
@@ -3,6 +3,11 @@
 * Adds support for PATCH requests. *dlee*
 
 
+## Rails 3.2.1 (January 26, 2012) ##
+
+*   Documentation fixes.
+
+
 ## Rails 3.2.0 (January 20, 2012) ##
 
 *   Redirect responses: 303 See Other and 307 Temporary Redirect now behave like
@@ -11,6 +16,21 @@
     *Jim Herz*
 
 
+## Rails 3.1.4 (unreleased) ##
+
+*   No changes
+
+
+## Rails 3.1.3 (November 20, 2011) ##
+
+*   No changes
+
+
+## Rails 3.1.2 (November 18, 2011) ##
+
+*   No changes
+
+
 ## Rails 3.1.1 (October 7, 2011) ##
 
 *   No changes.
@@ -23,12 +43,38 @@
     class User < ActiveResource::Base    self.format = :xml
     end
 
+
+## Rails 3.0.12 (unreleased) ##
+
+*   No changes.
+
+
+## Rails 3.0.11 (November 18, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.10 (August 16, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.9 (June 16, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.8 (June 7, 2011) ##
+
+*   No Changes
+
+
 ## Rails 3.0.7 (April 18, 2011) ##
 
 *   No changes.
 
 
-*   Rails 3.0.6 (April 5, 2011)
+## Rails 3.0.6 (April 5, 2011) ##
 
 *   No changes.
 
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 3ec81e05d6d36..3e40e08ca21ed 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -26,9 +26,22 @@
 
 *    Unicode database updated to 6.1.0.
 
+
+## Rails 3.2.1 (January 26, 2012) ##
+
+*   Documentation fixes and improvements.
+
+*   Update time zone offset information. *Ravil Bayramgalin*
+
+*   The deprecated `ActiveSupport::Base64.decode64` calls `::Base64.decode64`
+    now. *Jonathan Viney*
+
+*   Fixes uninitialized constant `ActiveSupport::TaggedLogging::ERROR`. *kennyj*
+
+
 ## Rails 3.2.0 (January 20, 2012) ##
 
-*   Add ActiveSupport::Cache::NullStore for use in development and testing. *Brian Durand*
+*   ActiveSupport::Base64 is deprecated in favor of ::Base64. *Sergey Nartimov*
 
 *   Module#synchronize is deprecated with no replacement.  Please use `monitor`
     from ruby's standard library.
@@ -97,6 +110,37 @@
 *   ActiveSupport::BufferedLogger#flush is deprecated.  Set sync on your
     filehandle, or tune your filesystem.
 
+
+## Rails 3.1.4 (unreleased) ##
+
+*   No changes
+
+
+## Rails 3.1.3 (November 20, 2011) ##
+
+*   No changes
+
+
+## Rails 3.1.2 (November 18, 2011) ##
+
+*   No changes
+
+
+## Rails 3.1.1 (October 7, 2011) ##
+
+*   ruby193: String#prepend is also unsafe *Akira Matsuda*
+
+*   Fix obviously breakage of Time.=== for Time subclasses *jeremyevans*
+
+*   Added fix so that file store does not raise an exception when cache dir does
+    not exist yet. This can happen if a delete_matched is called before anything
+    is saved in the cache. *Philippe Huibonhoa*
+
+*   Fixed performance issue where TimeZone lookups would require tzinfo each time *Tim Lucas*
+
+*   ActiveSupport::OrderedHash is now marked as extractable when using Array#extract_options! *Prem Sichanugrist*
+
+
 ## Rails 3.1.0 (August 30, 2011) ##
 
 *   ActiveSupport::Dependencies#load and ActiveSupport::Dependencies#require now
@@ -139,12 +183,38 @@
 *   JSON decoding now uses the multi_json gem which also vendors a json engine called OkJson. The yaml backend has been removed in favor of OkJson as a default engine for 1.8.x, while the built in 1.9.x json implementation will be used by default. *Josh Kalderimis*
 
 
+## Rails 3.0.12 (unreleased) ##
+
+*   No changes.
+
+
+## Rails 3.0.11 (November 18, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.10 (August 16, 2011) ##
+
+*  Delayed backtrace scrubbing in `load_missing_constant` until we actually
+   raise the exception
+
+
+## Rails 3.0.9 (June 16, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.8 (June 7, 2011) ##
+
+*   No changes.
+
+
 ## Rails 3.0.7 (April 18, 2011) ##
 
 *   Hash.from_xml no longer loses attributes on tags containing only whitespace *André Arko*
 
 
-*   Rails 3.0.6 (April 5, 2011)
+##   Rails 3.0.6 (April 5, 2011) ##
 
 *   No changes.
 
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index a5f32d1a2cda0..f556ee210d229 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -19,6 +19,15 @@
 
 *   Rails::Plugin has gone. Instead of adding plugins to vendor/plugins use gems or bundler with path or git dependencies. *Santiago Pastorino*
 
+
+## Rails 3.2.1 (January 26, 2012) ##
+
+*   Documentation fixes.
+
+*   Migration generation understands decimal{1.2} and decimal{1-2}, in
+    addition to decimal{1,2}. *José Valim*
+
+
 ## Rails 3.2.0 (January 20, 2012) ##
 
 *   Turn gem has been removed from default Gemfile. We still looking for a best presentation for tests output. *Guillermo Iguaran*
@@ -62,6 +71,22 @@
 *   Remove old 'config.paths.app.controller' API in favor of 'config.paths["app/controller"]' API *Guillermo Iguaran*
 
 
+## Rails 3.1.4 (unreleased) ##
+
+*   Setting config.force_ssl also marks the session cookie as secure.
+
+    *José Valim*
+
+*   Add therubyrhino to Gemfile in new applications when running under JRuby.
+
+    *Guillermo Iguaran*
+
+
+## Rails 3.1.3 (November 20, 2011) ##
+
+*   New apps should be generated with a sass-rails dependency of 3.1.5, not 3.1.5.rc.2
+
+
 ## Rails 3.1.2 (November 18, 2011) ##
 
 *   Engines: don't blow up if db/seeds.rb is missing.
@@ -178,12 +203,37 @@
 *   Include all helpers from plugins and shared engines in application *Piotr Sarnacki*
 
 
+## Rails 3.0.12 (unreleased) ##
+
+*   No changes.
+
+
+## Rails 3.0.11 (November 18, 2011) ##
+
+*   Updated Prototype UJS to lastest version fixing multiples errors in IE [Guillermo Iguaran]
+
+
+## Rails 3.0.10 (August 16, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.9 (June 16, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.8 (June 7, 2011) ##
+
+*   Fix Rake 0.9.0 support.
+
+
 ## Rails 3.0.7 (April 18, 2011) ##
 
 *   No changes.
 
 
-*   Rails 3.0.6 (April 5, 2011)
+##   Rails 3.0.6 (April 5, 2011) ##
 
 *   No changes.