diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index a9c1b03fa1..e774c83320 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Add documentation for :encoding option to mysql adapter. [marclove]
+
 * Added short-hand declaration style to migrations (inspiration from Sexy Migrations, http://errtheblog.com/post/2381) [DHH]. Example:
 
     create_table "products" do |t|
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index c0a09d7a54..8617191ac5 100755
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -129,6 +129,7 @@ module ActiveRecord
     # * <tt>:username</tt> -- Defaults to root
     # * <tt>:password</tt> -- Defaults to nothing
     # * <tt>:database</tt> -- The name of the database. No default, must be provided.
+    # * <tt>:encoding</tt> -- (Optional) Sets the client encoding by executing "SET NAMES <encoding>" after connection
     # * <tt>:sslkey</tt> -- Necessary to use MySQL with an SSL connection
     # * <tt>:sslcert</tt> -- Necessary to use MySQL with an SSL connection
     # * <tt>:sslcapath</tt> -- Necessary to use MySQL with an SSL connection