diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 418fe6fd4d304ffe25a69e448221d3754a1d9394..2e52fc245cf8a55b823317cf7017e8d89c51b744 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* The session class backing CGI::Session::ActiveRecordStore may be replaced with any class that duck-types with a subset of Active Record.  See docs for details.  #1238 [skaes@web.de]
+
 * Fixed that hashes was not working properly when passed by GET to lighttpd #849 [Nicholas Seckar]
 
 * Fixed assert_template nil will be true when no template was rendered #1565 [maceywj@telus.net]
diff --git a/actionpack/test/controller/active_record_store_test.rb b/actionpack/test/controller/active_record_store_test.rb
index 618995a3f27046f27075338500ffb0d105323955..a17a4916e389a0faf685759c43e14d1a4c4c7ab9 100644
--- a/actionpack/test/controller/active_record_store_test.rb
+++ b/actionpack/test/controller/active_record_store_test.rb
@@ -14,7 +14,13 @@
 require 'action_controller/session/active_record_store'
 
 #ActiveRecord::Base.logger = Logger.new($stdout)
-CGI::Session::ActiveRecordStore::Session.establish_connection(:adapter => 'sqlite3', :dbfile => ':memory:')
+begin
+  CGI::Session::ActiveRecordStore::Session.establish_connection(:adapter => 'sqlite3', :dbfile => ':memory:')
+  CGI::Session::ActiveRecordStore::Session.connection
+rescue Object
+  $stderr.puts 'SQLite 3 unavailable; falling to SQLite 2.'
+  CGI::Session::ActiveRecordStore::Session.establish_connection(:adapter => 'sqlite', :dbfile => ':memory:')
+end
 
 
 class ActiveRecordStoreTest < Test::Unit::TestCase