diff --git a/CHANGELOG b/CHANGELOG
index 25b3a08a..22f9d832 100755
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,23 @@
- * TRUNK:
+------------------------------------------------------------------------------
+ * 0.12.0:
+ 
+ 0.12 is mainly a bugfix release. We recommend all instiki Users to upgrade.
+ In this version, some security holes where fixed
+	- An XSS vulnerability in categories
+	- An XSS vulnerability in <nowiki>
+	- fixes that Instiki allows "dangerous" operations as HTTP GETs
+
+ as well as some other small improvements.
+	- fixes for instiki running on mongrel
+	- fixes for instiki running on mongrel_cluster
+
+ We added a lot of tests, synced with Jacques Distler's version and fixed 
+ small bugs as well. A note to Mac OSX users: use the Ruby One-Click-Installer
+ for OSX ( http://rubyosx.com ) or make sure you are not running into problems
+ with sqlite (see http://instiki.5uper.net/instiki/show/SQLite+issues+on+OSX)
+
+------------------------------------------------------------------------------
+ * 0.11.pl1
 
  - ANTISPAM: 
    - updated and included spam_patterns.txt
@@ -20,8 +39,7 @@
  - UPDATES:
    - Rails 1.2.1 tested and packaged with instiki
    - updated RubyZip to 0.9.1
-   - updated RedCloth to 3.0.4
-   - updated packaged sqlite3-ruby to 1.2.0
+   - updated packaged sqlite3-ruby
 
  - FEATURES:
    - fix: being logged in on more Webs at once works now [Jaques Distler]
diff --git a/README b/README
index 951cf549..846eac99 100755
--- a/README
+++ b/README
@@ -23,7 +23,7 @@ Instiki on BeOS, Amiga OS, OS2, Zeta OS and support for various exotic Platforms
 == Details
 
 You need at least Ruby Version 1.8.4 installed on your System. The second dependency is a Database System, but don't worry, maybe you are already served.
-
+There is a known issue when running instiki only on mongrel. If you experience a problem like "Superclass mismatch for class Cookie", please create your wiki via Webrick, then you can switch to mongrel. 
 
 === If you are on Windows
 
@@ -37,7 +37,8 @@ if you are running Windows 95, 98 or ME and cannot get instiki to run, try Versi
 
 Since the Apple guys really screwed it up, having an old Ruby Version (1.8.2) and a broken Readline Library with MacOSX Tiger, you have to
 
-- get the *One-Click Ruby Installer Package for OSX* from [ftp://ftp.math.ohio-state.edu/osx/pkgs/unix/Ruby-1.8.5-1-ub.mpkg.dmg]
+- use the Ruby One-Click-Installer for OSX ( http://rubyosx.com ) if you don't already have macports' Ruby
+- make sure you read http://instiki.5uper.net/instiki/show/SQLite+issues+on+OSX
 - run "ruby instiki.rb" via command-line in the directory 
 
 
diff --git a/config/database.yml b/config/database.yml
index 2c951fb6..5bd9a7d6 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -2,16 +2,15 @@
 # "Out of the box", Instiki stores it's data in sqlite3 database. Other options are listed below.
 
 development:
-    adapter: sqlite3
-    database: db/development.db
+    production
 
 test:
     adapter: sqlite3
     database: db/test.db.sqlite3
 
 production:
-  adapter: sqlite3
-  database: db/production.db.sqlite3
+    adapter: sqlite3
+    database: db/production.db.sqlite3
   
 # MySQL (default setup).  Versions 4.1 and 5.0 are recommended.
 #
diff --git a/db/production.db.sqlite3 b/db/production.db.sqlite3
new file mode 100644
index 00000000..42d6d2b6
Binary files /dev/null and b/db/production.db.sqlite3 differ