diff --git a/setup/createtables_mysql.inc.php b/setup/createtables_mysql.inc.php
new file mode 100644
index 0000000000..998ab30887
--- /dev/null
+++ b/setup/createtables_mysql.inc.php
@@ -0,0 +1,240 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare                                                             *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */
+  
+  // NOTE: Please use spaces to seperate the field names.  It makes copy and pasting easier.
+
+  $sql = "CREATE TABLE config (
+    config_name     varchar(255) NOT NULL,
+    config_value    varchar(100),
+    UNIQUE config_name (config_name)
+  )";
+  $db->query($sql);  
+ 
+  $sql = "CREATE TABLE applications (
+    app_name     varchar(25) NOT NULL,
+    app_title    varchar(50),
+    app_enabled  int,
+    app_order    int,
+    app_tables   varchar(255),
+    app_version  varchar(20) NOT NULL default '0.0',
+    UNIQUE app_name (app_name)
+  )";
+  $db->query($sql);  
+
+  $sql = "CREATE TABLE accounts (
+    account_id           int(11) DEFAULT '0' NOT NULL auto_increment,
+    account_lid          varchar(25) NOT NULL,
+    account_pwd          varchar(32) NOT NULL,
+    account_firstname    varchar(50),
+    account_lastname     varchar(50),
+    account_permissions  text,
+    account_groups       varchar(30),
+    account_lastlogin    int(11),
+    account_lastloginfrom varchar(255),
+    account_lastpwd_change int(11),
+    account_status       enum('A','L') DEFAULT 'A' NOT NULL,
+    PRIMARY KEY (account_id),
+    UNIQUE account_lid (account_lid)
+  )";
+  $db->query($sql);  
+
+  $sql = "create table groups (
+    group_id	int NOT NULL auto_increment,
+    group_name	varchar(255),
+    group_apps    varchar(255),
+    primary key(group_id)
+  )";
+  $db->query($sql);  
+
+  $sql = "CREATE TABLE preferences (
+    preference_owner   varchar(20),
+    preference_name    varchar(50),
+    preference_value   varchar(50),
+    preference_appname varchar(50)
+  )";
+  $db->query($sql);  
+
+  $sql = "CREATE TABLE sessions (
+    session_id        varchar(255) NOT NULL,
+    session_lid       varchar(20),
+    session_pwd       varchar(255),
+    session_ip        varchar(255),
+    session_logintime int(11),
+    session_dla       int(11),
+    UNIQUE sessionid (session_id)
+  )";
+  $db->query($sql);  
+
+  $sql = "CREATE TABLE app_sessions (
+    sessionid	varchar(255) NOT NULL,
+    loginid	varchar(20),
+    app	varchar(20),
+    content	text
+  )";
+  $db->query($sql);  
+
+  $sql = "create table access_log (
+    sessionid	varchar(255),
+    loginid	  varchar(30),
+    ip		   varchar(30),
+    li		   int,
+    lo		   varchar(255)
+  )";
+  $db->query($sql);  
+
+  $sql = "CREATE TABLE profiles (
+    con int(11) DEFAULT '0' NOT NULL auto_increment,
+    owner varchar(20),
+    title varchar(255),
+    phone_number varchar(255),
+    comments text,
+    picture_format varchar(255),
+    picture blob,
+    PRIMARY KEY (con)
+  )";
+  $db->query($sql);  
+
+  $sql = "CREATE TABLE addressbook (
+    ab_id       int(11) NOT NULL auto_increment,
+    ab_owner    varchar(25),
+    ab_access   varchar(10),
+    ab_firstname varchar(255),
+    ab_lastname varchar(255),
+    ab_email    varchar(255),
+    ab_hphone   varchar(255),
+    ab_wphone   varchar(255),
+    ab_fax      varchar(255),
+    ab_pager    varchar(255),
+    ab_mphone   varchar(255),
+    ab_ophone   varchar(255),
+    ab_street   varchar(255),
+    ab_city     varchar(255),
+    ab_state    varchar(255),
+    ab_zip      varchar(255),
+    ab_bday     varchar(255),
+    ab_notes    text,
+    ab_company  varchar(255),
+    ab_company_id int(10) unsigned,
+    ab_title    varchar(60),
+    ab_address2 varchar(60),
+    ab_url      varchar(255),
+    PRIMARY KEY (ab_id)
+  )";
+  $db->query($sql);  
+
+
+  $sql = "CREATE TABLE customers (
+    company_id int(10) unsigned NOT NULL auto_increment,
+    company_name varchar(255),
+    website varchar(80),
+    ftpsite varchar(80),
+    industry_type varchar(50),
+    status varchar(30),
+    software varchar(40),
+    lastjobnum int(10) unsigned,
+    lastjobfinished date,
+    busrelationship varchar(30),
+    notes text,
+    PRIMARY KEY (company_id)
+  );";
+  $db->query($sql);  
+
+  $sql = "CREATE TABLE todo (
+    todo_id      int(11) DEFAULT '0' NOT NULL auto_increment,
+    todo_id_parent	int(11) DEFAULT '0' NOT NULL,
+    todo_owner   varchar(25),
+    todo_access  varchar(10),
+    todo_des     text,
+    todo_pri     int(11),
+    todo_status  int(11),
+    todo_datecreated  int(11),
+    todo_startdate int(11),
+    todo_enddate int(11),
+    PRIMARY KEY (todo_id)
+  )";
+  $db->query($sql);  
+
+  $sql = "CREATE TABLE webcal_entry (
+    cal_id	int(11) DEFAULT '0' NOT NULL auto_increment,
+    cal_group_id	int(11),
+    cal_create_by varchar(25) NOT NULL,
+    cal_date	int(11) DEFAULT '0' NOT NULL,
+    cal_time	int(11),
+    cal_mod_date int(11),
+    cal_mod_time int(11),
+    cal_duration int(11) DEFAULT '0' NOT NULL,
+    cal_priority int(11) DEFAULT '2',
+    cal_type	varchar(10),
+    cal_access	char(10),
+    cal_name	varchar(80) NOT NULL,
+    cal_description text,
+    PRIMARY KEY (cal_id)
+  )";
+  $db->query($sql);  
+
+  $sql = "CREATE TABLE webcal_entry_repeats (
+    cal_id	int(11) DEFAULT '0' NOT NULL,
+    cal_type	enum('daily','weekly','monthlyByDay','monthlyByDate','yearly') DEFAULT 'daily' NOT NULL,
+    cal_end	int(11),
+    cal_frequency int(11) DEFAULT '1',
+    cal_days	char(7)
+  )";
+  $db->query($sql);  
+
+  $sql = "CREATE TABLE webcal_entry_user (
+    cal_id       int(11) DEFAULT '0' NOT NULL,
+    cal_login    varchar(25) NOT NULL,
+    cal_status   char(1) DEFAULT 'A',
+    PRIMARY KEY (cal_id, cal_login)
+  )";
+  $db->query($sql);  
+
+  $sql = "create table webcal_entry_groups (
+    cal_id	int,
+    groups	varchar(255)
+  )";
+  $db->query($sql);  
+
+  $sql = "CREATE TABLE newsgroups (
+    con             int(11) NOT NULL auto_increment,
+    name            varchar(255) NOT NULL,
+    messagecount    int(11) NOT NULL,
+    lastmessage     int(11) NOT NULL,
+    active          char DEFAULT 'N' NOT NULL,
+    lastread        int(11),
+    PRIMARY KEY (con),
+    UNIQUE name (name)
+  )";
+  $db->query($sql);  
+
+  $sql = "CREATE TABLE lang (
+    message_id      varchar(150) DEFAULT '' NOT NULL,
+    app_name        varchar(100) DEFAULT 'common' NOT NULL,
+    lang            varchar(5) DEFAULT '' NOT NULL,
+    content         text NOT NULL,
+    PRIMARY KEY (message_id,app_name,lang)
+  )";
+  $db->query($sql);
+
+  // I decied too hold off on this table until 0.9.4pre1 (jengo)  
+/*  $sql = "create table domains (
+    domain_id       int NOT NULL auto_increment,
+    domain_name     varchar(255),
+    domain_database varchar(255),
+    domain_status   enum('Active,Disabled'),
+    primary key(domain_id)
+  )";
+  $db->query($sql);
+*/
+
+?>
diff --git a/setup/createtables_pgsql.inc.php b/setup/createtables_pgsql.inc.php
new file mode 100644
index 0000000000..534fea29d2
--- /dev/null
+++ b/setup/createtables_pgsql.inc.php
@@ -0,0 +1,212 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare                                                             *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */
+
+  // NOTE: Please use spaces to seperate the field names.  It makes copy and pasting easier.
+
+  $sql = "CREATE TABLE config (
+    config_name     varchar(255) NOT NULL UNIQUE,
+    config_value    varchar(100) NOT NULL
+  )";
+  $db->query($sql);
+
+  $sql = "create table applications (
+    app_name     varchar(25) NOT NULL,
+    app_title    varchar(50),
+    app_enabled  int,
+    app_order    int,
+    app_tables   varchar(255),
+    app_version  varchar(20) NOT NULL default '0.0',
+    unique(app_name)
+  )";
+  $db->query($sql);
+
+
+  $sql = "create table accounts (
+    account_id             serial,
+    account_lid            varchar(25) NOT NULL,
+    account_pwd            char(32) NOT NULL,
+    account_firstname      varchar(50),
+    account_lastname       varchar(50),
+    account_permissions    text,
+    account_groups         varchar(30),
+    account_lastlogin	     int,
+    account_lastloginfrom  varchar(255),
+    account_lastpwd_change int,
+    account_status         char(1),
+    unique(account_lid)
+  )";
+  $db->query($sql);
+
+  $sql = "create table groups (
+    group_id     serial,
+    group_name   varchar(50),
+    group_apps   varchar(255)
+  )";
+  $db->query($sql);
+  
+  $sql = "create table sessions (
+    session_id         varchar(255),
+    session_lid        varchar(20),
+    session_pwd        varchar(255),
+    session_ip         varchar(255),
+    session_logintime	 int,
+    session_dla        int,
+    unique(session_id)
+  )";
+  $db->query($sql);
+
+  $sql = "CREATE TABLE app_sessions (
+   sessionid	varchar(255) NOT NULL,
+   loginid	varchar(20),
+   app	        varchar(20),
+   content	text
+  )";
+  $db->query($sql);
+
+  $sql = "create table preferences ( 
+    preference_owner       varchar(20),
+    preference_name        varchar(50),
+    preference_value       varchar(50),
+    preference_appname     varchar(50)
+  )";
+  $db->query($sql);
+
+  $sql = "create table access_log (
+   sessionid    varchar(255),
+   loginid      varchar(30),
+   ip           varchar(30),
+   li           int,
+   lo           varchar(255)
+  )";
+  $db->query($sql);
+
+  $sql = "CREATE TABLE profiles (
+   con		serial,
+   owner 	varchar(20),
+   title 	varchar(255),
+   phone_number varchar(255),
+   comments 	text,
+   picture_format varchar(255),
+   picture 	text
+  )";
+  $db->query($sql);
+
+  $sql = "create table addressbook (
+    ab_id       serial,
+    ab_owner    varchar(25),
+    ab_access   varchar(10),
+    ab_firstname varchar(255),
+    ab_lastname varchar(255),
+    ab_email    varchar(255),
+    ab_hphone   varchar(255),
+    ab_wphone   varchar(255),
+    ab_fax      varchar(255),
+    ab_pager    varchar(255),
+    ab_mphone   varchar(255),
+    ab_ophone   varchar(255),
+    ab_street   varchar(255),
+    ab_city     varchar(255),
+    ab_state    varchar(255),
+    ab_zip      varchar(255),
+    ab_bday     varchar(255),
+    ab_notes    varchar(255),
+    ab_company  varchar(255),
+    ab_company_id int,
+    ab_title    varchar(60),   
+    ab_address2 varchar(60)
+    ab_url      varchar(255),
+  )";
+  $db->query($sql);
+
+  $sql = "create table todo (
+    todo_id	     serial,
+    todo_id_parent int,
+    todo_owner	varchar(25),
+    todo_access	varchar(10),
+    todo_des	text,
+    todo_pri	int,
+    todo_status	int,
+    todo_datecreated	int,
+    todo_startdate int
+    todo_enddate int
+  )";
+  $db->query($sql);
+
+  $sql = "CREATE TABLE webcal_entry (
+    cal_id	serial,
+    cal_group_id	int NULL,
+    cal_create_by	varchar(25) NOT NULL,
+    cal_date	int NOT NULL,
+    cal_time	int NULL,
+    cal_mod_date	int,
+    cal_mod_time	int,
+    cal_duration	int NOT NULL,
+    cal_priority	int DEFAULT 2,
+    cal_type	varchar(10),
+    cal_access	varchar(10),
+    cal_name	varchar(80) NOT NULL,
+    cal_description varchar(255)
+  )";
+  $db->query($sql);
+
+  $sql = "CREATE TABLE webcal_entry_user (
+    cal_id	     int,
+    cal_login	varchar(25) NOT NULL,
+    cal_status	char(1) DEFAULT 'A'
+  )";
+  $db->query($sql);
+
+  $sql = "create table webcal_entry_repeats ( 
+    cal_id	     int,
+    cal_type	varchar(20),
+    cal_end	int,
+    cal_frequency	int default 1,
+    cal_days	char(7)
+  )";
+  $db->query($sql);
+
+  $sql = "create table webcal_entry_groups (
+    cal_id	int,
+    groups	varchar(255)
+  )";
+  $db->query($sql);
+
+  $sql = "CREATE TABLE newsgroups (
+    con		serial,
+    name		varchar(255) NOT NULL,
+    messagecount	int,
+    lastmessage	int,
+    active	char DEFAULT 'N' NOT NULL,
+    lastread	int
+  )";
+  $db->query($sql);
+
+  $sql = "CREATE TABLE lang (
+    message_id     varchar(150) DEFAULT '' NOT NULL,
+    app_name       varchar(100) DEFAULT 'common' NOT NULL,
+    lang           varchar(5) DEFAULT '' NOT NULL,
+    content        text NOT NULL,
+    unique(message_id,app_name,lang)
+  )";
+  $db->query($sql);
+
+  $sql = "CREATE TABLE categories (
+    cat_id          serial,
+    account_id      int DEFAULT '0' NOT NULL,
+    app_name        varchar(25) NOT NULL,
+    cat_name        varchar(150) NOT NULL,
+    cat_description text NOT NULL
+  )";
+  $db->query($sql);
+
+?>
diff --git a/setup/upgradetables_mysql.inc.php b/setup/upgradetables_mysql.inc.php
index 34e938f4cd..2fed11c4e2 100644
--- a/setup/upgradetables_mysql.inc.php
+++ b/setup/upgradetables_mysql.inc.php
@@ -366,6 +366,19 @@
 	$currentver = "0.9.3pre10";
 	update_version_table();
       }
+      
+   if ($currentver == "0.9.3pre10") {
+   	$sql = "ALTER TABLE todo ADD todo_startdate int(11) not null";
+   	$db->query($sql);
+		
+		$sql "ALTER TABLE todo CHANGE todo_datedue todo_enddate int(11) not null";
+		$db->query($sql);	
+		
+		$currentver = "0.9.3pre11";
+		update_version_table();
+	}
+   
+   
       echo "  <tr bgcolor=\"e6e6e6\">\n";
       echo "    <td>Upgrade from 0.9.2 to $currentver is completed.</td>\n";
       echo "  </tr>\n";
diff --git a/setup/upgradetables_pgsql.inc.php b/setup/upgradetables_pgsql.inc.php
index 3b66d161a8..0af1a3b3ec 100644
--- a/setup/upgradetables_pgsql.inc.php
+++ b/setup/upgradetables_pgsql.inc.php
@@ -355,6 +355,17 @@
 	$currentver = "0.9.3pre10";
 	update_version_table();
     }
+
+   if ($currentver == "0.9.3pre10") {
+   	$sql = "ALTER TABLE todo ADD todo_startdate int not null";
+   	$db->query($sql);
+		
+		$sql "ALTER TABLE todo CHANGE todo_datedue todo_enddate int not null";
+		$db->query($sql);	
+		
+		$currentver = "0.9.3pre11";
+		update_version_table();
+	}
       
     echo "  <tr bgcolor=\"e6e6e6\">\n";
     echo "    <td>Upgrade from 0.9.2 to $currentver is completed.</td>\n";