--- a/update_config.py	Wed Mar 03 14:32:30 2010 +0000
+++ b/update_config.py	Wed Mar 03 20:23:18 2010 +0000
@@ -75,7 +75,7 @@
     global had_config
 
     had_config = cp.remove_section('config')
-    add_sections(cp, ('domain', 'account'))
+    add_sections(cp, ('domain', 'account', 'mailbox'))
     if cp.has_section('domdir'):
         for src, dst in (('domdir.mode',   'domain.directory_mode'),
                          ('domdir.delete', 'domain.delete_directory'),
@@ -89,10 +89,12 @@
     for src, dst in (('maildir.mode',      'account.directory_mode'),
                      ('maildir.diskusage', 'account.disk_usage'),
                      ('maildir.delete',    'account.delete_directory'),
+                     ('maildir.folders',   'mailbox.folders'),
                      ('misc.forcedel',     'domain.force_deletion'),
                      ('misc.passwdscheme', 'misc.password_scheme'),
                      ('misc.dovecotvers',  'misc.dovecot_version')):
         move_option(cp, src, dst)
+    cp.remove_section('maildir')
 
 # def main():
 if __name__ == '__main__':