--- a/INSTALL	Fri Aug 21 11:24:28 2009 +0000
+++ b/INSTALL	Fri Aug 21 11:25:14 2009 +0000
@@ -31,8 +31,10 @@
     CREATE DATABASE mailsys ENCODING 'UTF8';
     # connect to the new database
     \c mailsys
-    # import db structure
+    # either import the database structure for Dovecot v1.0.x/v1.1.x
     \i /path/to/create_tables.pgsql
+    # or import the database structure for Dovecot v1.2.x
+    \i /path/to/create_tables-dovecot-1.2.x.pgsql
 
     # create users and group
     CREATE USER postfix ENCRYPTED password 'DB PASSWORD for Postfix';
@@ -103,7 +105,9 @@
     chmod 700 /usr/local/lib/dovecot
     chown nobody /usr/local/lib/dovecot
     cp /usr/lib/dovecot/deliver /usr/local/lib/dovecot/
-    chmod u+s /usr/local/lib/dovecot/deliver
+    chgrp nogroup /usr/local/lib/dovecot/deliver
+    chmod u+s,o-rwx /usr/local/lib/dovecot/deliver
+
 
 
 Start or restart Dovecot

--- a/UPGRADE	Fri Aug 21 11:24:28 2009 +0000
+++ b/UPGRADE	Fri Aug 21 11:25:14 2009 +0000
@@ -9,20 +9,41 @@
     * backup/dump your database.
     * backup/dump your database!
     
-    * start psql and connect to the appropriate database (ex. psql mailsys)
+    * start psql and connect to the appropriate database
+      (ex. psql mailsys mailsys vmm -W -h localhost)
     * update the database: \i update_tables_0.4.x-0.5.pgsql
     * GRANT SELECT ON postfix_alias TO postfix;
                                        ^^^^^^^^ <- your Postfix db user
 
+
+  Dovecot v1.2.x
+    -> Are you already using Dovecot v1.2.x?
+       * update the database for Dovecot v1.2.x:
+         \i update_tables_0.5.x_for_dovecot-1.2.x.pgsql
+       * GRANT SELECT ON dovecot_password TO dovecot;
+                                             ^^^^^^^^ <- your Dovecot db user
+
+       * When you are using the SQL function »dovecotpassword()« in your
+         dovecot-sql.conf, update it also:
+         \i update_types_and_functions_0.5.x_for_dovecot-1.2.x.pgsql
+
+       * You have also to adjust the permissions of the set-uid deliver copy:
+         chgrp nogroup /usr/local/lib/dovecot/deliver
+	 chmod u+s,o-rwx /usr/local/lib/dovecot/deliver
+
     * execute upgrade.sh
 
     * start Dovecot and Postfix
 
 
-If you have installed vmm 0.5:
+
+If you have installed vmm 0.5.x:
 
     * execute upgrade.sh
 
+    -> Are you already using Dovecot v1.2.x?
+       See a few lines above.
+
 
 else
      * read INSTALL