diff --git a/phpgwapi/setup/tables_baseline.inc.php b/phpgwapi/setup/tables_baseline.inc.php
index 56c4d73a14..5e11848869 100644
--- a/phpgwapi/setup/tables_baseline.inc.php
+++ b/phpgwapi/setup/tables_baseline.inc.php
@@ -1,6 +1,6 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Setup                                                     *
+  * phpGroupWare                                                             *
   * http://www.phpgroupware.org                                              *
   * --------------------------------------------                             *
   *  This program is free software; you can redistribute it and/or modify it *
@@ -9,13 +9,262 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id $ */
+  /* $Id$ */
 
-  /**************************************************************************\
-	* This file should never be changed!                                       *
-	* This is only to be used for the original table definitions.              *
-	* Any changes to the tables must be done thru the tables_update and then   *
-	* generate the tables_current                                              *
-  \**************************************************************************/
-  
-?>
\ No newline at end of file
+	$phpgw_baseline = array(
+		'config' => array(
+			'fd' => array(
+				'config_name' => array('type' => 'varchar', 'precision' => 25, 'nullable' => false),
+				'config_value' => array('type' => 'varchar', 'precision' => 100)
+			),
+			'pk' => array(),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array('config_name')
+		),
+		'applications' => array(
+			'fd' => array(
+				'app_name' => array('type' => 'varchar', 'precision' => 25, 'nullable' => false),
+				'app_title' => array('type' => 'varchar', 'precision' => 50),
+				'app_enabled' => array('type' => 'int', 'precision' => 4),
+				'app_order' => array('type' => 'int', 'precision' => 4),
+				'app_tables' => array('type' => 'varchar', 'precision' => 255),
+				'app_version' => array('type' => 'varchar', 'precision' => 20, 'nullable' => false, 'default' => '0.0')
+			),
+			'pk' => array(),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array('app_name')
+		),
+		'accounts' => array(
+			'fd' => array(
+				'account_id' => array('type' => 'auto', 'nullable' => false),
+				'account_lid' => array('type' => 'varchar', 'precision' => 25, 'nullable' => false),
+				'account_pwd' => array('type' => 'varchar', 'precision' => 32, 'nullable' => false),
+				'account_firstname' => array('type' => 'varchar', 'precision' => 50),
+				'account_lastname' => array('type' => 'varchar', 'precision' => 50),
+				'account_permissions' => array('type' => 'text'),
+				'account_groups' => array('type' => 'varchar', 'precision' => 30),
+				'account_lastlogin' => array('type' => 'int', 'precision' => 4),
+				'account_lastloginfrom' => array('type' => 'varchar', 'precision' => 255),
+				'account_lastpwd_change' => array('type' => 'int', 'precision' => 4),
+				'account_status' => array('type' => 'char', 'precision' => 1, 'nullable' => false, 'default' => 'A')
+			),
+			'pk' => array('account_id'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array('account_lid')
+		),
+		'groups' => array(
+			'fd' => array(
+				'group_id' => array('type' => 'auto', 'nullable' => false),
+				'group_name' => array('type' => 'varchar', 'precision' => 255),
+				'group_apps' => array('type' => 'varchar', 'precision' => 255)
+			),
+			'pk' => array('group_id'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),
+		'preferences' => array(
+			'fd' => array(
+				'preference_owner' => array('type' => 'varchar', 'precision' => 20, 'nullable' => false),
+				'preference_name' => array('type' => 'varchar', 'precision' => 50, 'nullable' => false),
+				'preference_value' => array('type' => 'varchar', 'precision' => 50),
+				'preference_appname' => array('type' => 'varchar', 'precision' => 50)
+			),
+			'pk' => array('preference_owner', 'preference_name'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),
+		'sessions' => array(
+			'fd' => array(
+				'session_id' => array('type' => 'varchar', 'precision' => 255, 'nullable' => false),
+				'session_lid' => array('type' => 'varchar', 'precision' => 20),
+				'session_pwd' => array('type' => 'varchar', 'precision' => 255),
+				'session_ip' => array('type' => 'varchar', 'precision' => 255),
+				'session_logintime' => array('type' => 'varchar', 'precision' => 4),
+				'session_dla' => array('type' => 'varchar', 'precision' => 4)
+			),
+			'pk' => array(),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array('session_id')
+		),
+		'app_sessions' => array(
+			'fd' => array(
+				'sessionid' => array('type' => 'varchar', 'precision' => 255, 'nullable' => false),
+				'loginid' => array('type' => 'varchar', 'precision' => 20),
+				'app' => array('type' => 'varchar', 'precision' => 20),
+				'content' => array('type' => 'text')
+			),
+			'pk' => array(),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),
+		'access_log' => array(
+			'fd' => array(
+				'sessionid' => array('type' => 'varchar', 'precision' => 30),
+				'loginid' => array('type' => 'varchar', 'precision' => 30),
+				'ip' => array('type' => 'varchar', 'precision' => 30),
+				'li' => array('type' => 'int', 'precision' => 4),
+				'lo' => array('type' => 'int', 'precision' => 4)
+			),
+			'pk' => array(),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),
+		'profiles' => array(
+			'fd' => array(
+				'con' => array('type' => 'auto', 'nullable' => false),
+				'owner' => array('type' => 'varchar', 'precision' => 20),
+				'title' => array('type' => 'varchar', 'precision' => 255),
+				'phone_number' => array('type' => 'varchar', 'precision' => 255),
+				'comments' => array('type' => 'text'),
+				'picture_format' => array('type' => 'varchar', 'precision' => 255),
+				'picture' => array('type' => 'blob')
+			),
+			'pk' => array('con'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),
+		'addressbook' => array(
+			'fd' => array(
+				'ab_id' => array('type' => 'auto', 'nullable' => false),
+				'ab_owner' => array('type' => 'varchar', 'precision' => 25),
+				'ab_access' => array('type' => 'varchar', 'precision' => 10),
+				'ab_firstname' => array('type' => 'varchar', 'precision' => 255),
+				'ab_lastname' => array('type' => 'varchar', 'precision' => 255),
+				'ab_email' => array('type' => 'varchar', 'precision' => 255),
+				'ab_hphone' => array('type' => 'varchar', 'precision' => 255),
+				'ab_wphone' => array('type' => 'varchar', 'precision' => 255),
+				'ab_fax' => array('type' => 'varchar', 'precision' => 255),
+				'ab_pager' => array('type' => 'varchar', 'precision' => 255),
+				'ab_mphone' => array('type' => 'varchar', 'precision' => 255),
+				'ab_ophone' => array('type' => 'varchar', 'precision' => 255),
+				'ab_street' => array('type' => 'varchar', 'precision' => 255),
+				'ab_city' => array('type' => 'varchar', 'precision' => 255),
+				'ab_state' => array('type' => 'varchar', 'precision' => 255),
+				'ab_zip' => array('type' => 'varchar', 'precision' => 255),
+				'ab_bday' => array('type' => 'varchar', 'precision' => 255),
+				'ab_notes' => array('type' => 'text'),
+				'ab_company' => array('type' => 'varchar', 'precision' => 255),
+			),
+			'pk' => array('ab_id'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),
+		'todo' => array(
+			'fd' => array(
+				'todo_id' => array('type' => 'auto', 'nullable' => false),
+				'todo_owner' => array('type' => 'varchar', 'precision' => 25),
+				'todo_access' => array('type' => 'varchar', 'precision' => 10),
+				'todo_des' => array('type' => 'text'),
+				'todo_pri' => array('type' => 'int', 'precision' => 4),
+				'todo_status' => array('type' => 'int', 'precision' => 4),
+				'todo_datecreated' => array('type' => 'int', 'precision' => 4),
+				'todo_datedue' => array('type' => 'int', 'precision' => 4)
+			),
+			'pk' => array('todo_id'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),
+		'webcal_entry' => array(
+			'fd' => array(
+				'cal_id' => array('type' => 'auto', 'nullable' => false),
+				'cal_group_id' => array('type' => 'int', 'precision' => 4),
+				'cal_create_by' => array('type' => 'varchar', 'precision' => 25, 'nullable' => false),
+				'cal_date' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
+				'cal_time' => array('type' => 'int', 'precision' => 4),
+				'cal_mod_date' => array('type' => 'int', 'precision' => 4),
+				'cal_mod_time' => array('type' => 'int', 'precision' => 4),
+				'cal_duration' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
+				'cal_priority' => array('type' => 'int', 'precision' => 4, 'default' => '2'),
+				'cal_type' => array('type' => 'varchar', 'precision' => 10),
+				'cal_access' => array('type' => 'char', 'precision' => 10),
+				'cal_name' => array('type' => 'varchar', 'precision' => 80, 'nullable' => false),
+				'cal_description' => array('type' => 'text'),
+			),
+			'pk' => array('cal_id'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),
+		'webcal_entry_repeats' => array(
+			'fd' => array(
+				'cal_id' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
+				'cal_type' => array('type' => 'varchar', 'precision' => 20, 'nullable' => false, 'default' => 'daily'),
+				'cal_end' => array('type' => 'int', 'precision' => 4),
+				'cal_frequency' => array('type' => 'int', 'precision' => 4, 'default' => '1'),
+				'cal_days' => array('type' => 'char', 'precision' => 7)
+			),
+			'pk' => array(),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),
+		'webcal_entry_user' => array(
+			'fd' => array(
+				'cal_id' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
+				'cal_login' => array('type' => 'varchar', 'precision' => 25, 'nullable' => false),
+				'cal_status' => array('type' => 'char', 'precision' => 1, 'default' => 'A')
+			),
+			'pk' => array('cal_id', 'cal_login'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),
+		'webcal_entry_groups' => array(
+			'fd' => array(
+				'cal_id' => array('type' => 'int', 'precision' => 4),
+				'groups' => array('type' => 'varchar', 'precision' => 255)
+			),
+			'pk' => array(),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),
+		'newsgroups' => array(
+			'fd' => array(
+				'con' => array('type' => 'auto', 'nullable' => false),
+				'name' => array('type' => 'varchar', 'precision' => 255, 'nullable' => false),
+				'messagecount' => array('type' => 'int', 'precision' => 4, 'nullable' => false),
+				'lastmessage' => array('type' => 'int', 'precision' => 4, 'nullable' => false),
+				'active' => array('type' => 'char', 'precision' => 1, 'nullable' => false, 'default' => 'N'),
+				'lastread' => array('type' => 'int', 'precision' => 4)
+			),
+			'pk' => array('con'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array('name')
+		),
+		'users_newsgroups' => array(
+			'fd' => array(
+				'owner' => array('type' => 'int', 'precision' => 4, 'nullable' => false),
+				'newsgroup' => array('type' => 'int', 'precision' => 4, 'nullable' => false)
+			),
+			'pk' => array(),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),
+		'lang' => array(
+			'fd' => array(
+				'message_id' => array('type' => 'varchar', 'precision' => 150, 'nullable' => false, 'default' => ''),
+				'app_name' => array('type' => 'varchar', 'precision' => 100, 'nullable' => false, 'default' => 'common'),
+				'lang' => array('type' => 'varchar', 'precision' => 5, 'nullable' => false, 'default' => ''),
+				'content' => array('type' => 'text')
+			),
+			'pk' => array('message_id', 'app_name', 'lang'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		)
+	);
+?>
diff --git a/phpgwapi/setup/tables_current.inc.php b/phpgwapi/setup/tables_current.inc.php
index 26a28433ee..4ab04a4fd2 100644
--- a/phpgwapi/setup/tables_current.inc.php
+++ b/phpgwapi/setup/tables_current.inc.php
@@ -1,6 +1,6 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Setup                                                     *
+  * phpGroupWare                                                             *
   * http://www.phpgroupware.org                                              *
   * --------------------------------------------                             *
   *  This program is free software; you can redistribute it and/or modify it *
@@ -9,10 +9,196 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id $ */
-  /**************************************************************************\
-  * This file should be generated for you. It should never be edited by hand *
-  \**************************************************************************/
+  /* $Id$ */
 
 	$phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.11.010';
+
+	$phpgw_baseline = array(
+		'phpgw_config' => array(
+			'fd' => array(
+				'config_app' => array('type' => 'varchar', 'precision' => 50)
+				'config_name' => array('type' => 'varchar', 'precision' => 255, 'nullable' => false),
+				'config_value' => array('type' => 'varchar', 'precision' => 100)
+			),
+			'pk' => array(),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array('config_name')
+		),
+		'phpgw_applications' => array(
+			'fd' => array(
+				'app_name' => array('type' => 'varchar', 'precision' => 25, 'nullable' => false),
+				'app_title' => array('type' => 'varchar', 'precision' => 50),
+				'app_enabled' => array('type' => 'int', 'precision' => 4),
+				'app_order' => array('type' => 'int', 'precision' => 4),
+				'app_tables' => array('type' => 'varchar', 'precision' => 255),
+				'app_version' => array('type' => 'varchar', 'precision' => 20, 'nullable' => false, 'default' => '0.0')
+			),
+			'pk' => array(),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array('app_name')
+		),
+		'phpgw_acl' => array(
+			'fd' => array(
+				'acl_appname' => array('type' => 'varchar', 'precision' => 50),
+				'acl_location' => array('type' => 'varchar', 'precision' => 255),
+				'acl_account' => array('type' => 'int', 'precision' => 4),
+				'acl_rights' => array('type' => 'int', 'precision' => 4)
+			),
+			'pk' => array(),
+			'ix' => array(),
+			'fk' => array(),
+			'uc' => array()
+		),
+		'phpgw_accounts' => array(
+			'fd' => array(
+				'account_id' => array('type' => 'auto', 'nullable' => false),
+				'account_lid' => array('type' => 'varchar', 'precision' => 25, 'nullable' => false),
+				'account_pwd' => array('type' => 'varchar', 'precision' => 32, 'nullable' => false),
+				'account_firstname' => array('type' => 'varchar', 'precision' => 50),
+				'account_lastname' => array('type' => 'varchar', 'precision' => 50),
+				'account_permissions' => array('type' => 'text'),
+				'account_groups' => array('type' => 'varchar', 'precision' => 30),
+				'account_lastlogin' => array('type' => 'int', 'precision' => 4),
+				'account_lastloginfrom' => array('type' => 'varchar', 'precision' => 255),
+				'account_lastpwd_change' => array('type' => 'int', 'precision' => 4),
+				'account_status' => array('type' => 'char', 'precision' => 1, 'nullable' => false, 'default' => 'A'),
+				'account_expires' => array('type' => 'int', 'precision' => 4)
+			),
+			'pk' => array('account_id'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array('account_lid')
+		),
+		'phpgw_preferences' => array(
+			'fd' => array(
+				'preference_owner' => array('type' => 'varchar', 'precision' => 20, 'nullable' => false),
+				'preference_value' => array('type' => 'text')
+			),
+			'pk' => array('preference_owner', 'preference_name'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),
+		'phpgw_sessions' => array(
+			'fd' => array(
+				'session_id' => array('type' => 'varchar', 'precision' => 255, 'nullable' => false),
+				'session_lid' => array('type' => 'varchar', 'precision' => 20),
+				'session_pwd' => array('type' => 'varchar', 'precision' => 255),
+				'session_ip' => array('type' => 'varchar', 'precision' => 255),
+				'session_logintime' => array('type' => 'varchar', 'precision' => 4),
+				'session_dla' => array('type' => 'varchar', 'precision' => 4)
+				'session_action' => array('type' => 'varchar', 'precision' => 255),
+				'session_flags' => array('type' => 'char', 'precision' => 2),
+			),
+			'pk' => array(),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array('session_id')
+		),
+		'phpgw_app_sessions' => array(
+			'fd' => array(
+				'sessionid' => array('type' => 'varchar', 'precision' => 255, 'nullable' => false),
+				'loginid' => array('type' => 'varchar', 'precision' => 20),
+				'location' => array('type' => 'varchar', 'precision' => 255),
+				'app' => array('type' => 'varchar', 'precision' => 20),
+				'content' => array('type' => 'text'),
+				'session_dla' => array('type' => 'int', 'precision' => 4)
+			),
+			'pk' => array(),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),
+		'phpgw_access_log' => array(
+			'fd' => array(
+				'sessionid' => array('type' => 'varchar', 'precision' => 30),
+				'loginid' => array('type' => 'varchar', 'precision' => 30),
+				'ip' => array('type' => 'varchar', 'precision' => 30),
+				'li' => array('type' => 'int', 'precision' => 4),
+				'lo' => array('type' => 'varchar', 'precision' => 255)
+			),
+			'pk' => array(),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),
+		'phpgw_hooks' => array(
+			'fd' => array(
+				'hook_id' => array('type' => 'auto', 'nullable' => false),
+				'hook_appname' => array('type' => 'varchar', 'precision' => 255),
+				'hook_location' => array('type' => 'varchar', 'precision' => 255),
+				'hook_filename' => array('type' => 'varchar', 'precision' => 255)
+			),
+			'pk' => array('hook_id'),
+			'ix' => array(),
+			'fk' => array(),
+			'uc' => array()
+		),
+		'phpgw_categories' => array(
+			'fd' => array(
+				'cat_id' => array('type' => 'auto', 'nullable' => false),
+				'account_id' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
+				'app_name' => array('type' => 'varchar', 'precision' => 25, 'nullable' => false),
+				'cat_name' => array('type' => 'varchar', 'precision' => 150, 'nullable' => false),
+				'cat_description' => array('type' => 'text', 'nullable' => false)
+			),
+			'pk' => array('cat_id'),
+			'ix' => array(),
+			'fk' => array(),
+			'uc' => array()
+		),
+		'languages' => array(
+			'fd' => array(
+				'lang_id' => array('type' => 'varchar', 'precision' => 2, 'nullable' => false),
+				'lang_name' => array('type' => 'varchar', 'precision' => 50, 'nullable' => false),
+				'available' => array('type' => 'char', 'precision' => 3, 'nullable' => false, 'default' => 'No')
+			),
+			'pk' => array('lang_id'),
+			'ix' => array(),
+			'fk' => array(),
+			'uc' => array()
+		),
+		'lang' => array(
+			'fd' => array(
+				'message_id' => array('type' => 'varchar', 'precision' => 150, 'nullable' => false, 'default' => ''),
+				'app_name' => array('type' => 'varchar', 'precision' => 100, 'nullable' => false, 'default' => 'common'),
+				'lang' => array('type' => 'varchar', 'precision' => 5, 'nullable' => false, 'default' => ''),
+				'content' => array('type' => 'text')
+			),
+			'pk' => array('message_id', 'app_name', 'lang'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),
+		'phpgw_nextid' => array(
+			'fd' => array(
+				'id' => array('type' => 'int', 'nullable' => true),
+				'appname' => array('type' => 'varchar', 'precision' => 25, 'nullable' => false),
+			),
+			'pk' => array(),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array('id')
+		),
+		'phpgw_categories' => array(
+			'fd' => array(
+				'cat_id' => array('type' => 'auto', 'precision' => 9, 'default' => 0, 'nullable' => false),
+				'cat_main' => array('type' => 'int', 'precision' => 9, 'default' => 0, 'nullable' => false),
+				'cat_parent' => array('type' => 'int', 'precision' => 9, 'default' => 0, 'nullable' => false),
+				'cat_level' => array('type' => 'int', 'precision' => 3, 'default' =>0, 'nullable' => false),
+				'cat_owner' => array('type' => 'int', 'precision' => 11, 'default' => 0, 'nullable' => false),
+				'cat_access' => array('type' => 'char', 'precision' => 7),
+				'cat_appname' => array('type' => 'varchar', 'precision' => 50, 'nullable' => false),
+				'cat_name' => array('type' => 'varchar', 'precision' => 150, 'nullable' => false),
+				'cat_description' => array('type' => 'varchar', 'precision' => 255, 'nullable' => false),
+				'cat_data' => array('type' => 'text')
+			),
+			'pk' => array('cat_id'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),
+	);
 ?>