diff --git a/setup/sql/mysql_newtables.inc.php b/setup/sql/mysql_newtables.inc.php
index 425e724419..dcf6683431 100644
--- a/setup/sql/mysql_newtables.inc.php
+++ b/setup/sql/mysql_newtables.inc.php
@@ -68,7 +68,6 @@
     acl_appname       varchar(50),
     acl_location      varchar(255),
     acl_account       int,
-    acl_account_type  char(1),
     acl_rights        int
   )";
   $phpgw_setup->db->query($sql);  
@@ -292,7 +291,7 @@
          );";
   $phpgw_setup->db->query($sql); 
 
-  $phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.10pre10';
+  $phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.10pre11';
   $phpgw_info['setup']['oldver']['phpgwapi'] = $phpgw_info['setup']['currentver']['phpgwapi'];
   update_version_table();
 //  $phpgw_setup->update_version_table();
diff --git a/setup/sql/mysql_upgrade_beta.inc.php b/setup/sql/mysql_upgrade_beta.inc.php
index 9612d78467..8fbc5845c8 100644
--- a/setup/sql/mysql_upgrade_beta.inc.php
+++ b/setup/sql/mysql_upgrade_beta.inc.php
@@ -1000,6 +1000,15 @@
 		$phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.10pre10';
   }
 
+  $test[] = '0.9.10pre10';
+  function upgrade0_9_10pre10()
+  {
+		global $phpgw_info, $phpgw_setup;
+
+		$phpgw_setup->db->query("alter table phpgw_acl drop column acl_account_type",__LINE__,__FILE__);
+     
+		$phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.10pre11';
+  }
 
   reset ($test);
   while (list ($key, $value) = each ($test)){
diff --git a/setup/sql/pgsql_newtables.inc.php b/setup/sql/pgsql_newtables.inc.php
index dd521d11dd..dc91c8d388 100644
--- a/setup/sql/pgsql_newtables.inc.php
+++ b/setup/sql/pgsql_newtables.inc.php
@@ -67,7 +67,6 @@
     acl_appname       varchar(50),
     acl_location      varchar(255),
     acl_account       int,
-    acl_account_type  char(1),
     acl_rights        int
   )";
   $phpgw_setup->db->query($sql);  
diff --git a/setup/sql/pgsql_upgrade_beta.inc.php b/setup/sql/pgsql_upgrade_beta.inc.php
index 868b89bcf8..b5a754dd89 100644
--- a/setup/sql/pgsql_upgrade_beta.inc.php
+++ b/setup/sql/pgsql_upgrade_beta.inc.php
@@ -957,7 +957,7 @@
      
      $tables = Array('addressbook','calendar_entry','f_forums','phpgw_categories','todo');
      $fields["addressbook"] = Array('ab_access','ab_id');
-     $fields["calendar_entry"] = Array('cal_group','cal_id');
+                                $fields["calendar_entry"] = Array('cal_group','cal_id');
      $fields["f_forums"] = Array('groups','id');
      $fields["phpgw_categories"] = Array('cat_access','cat_id');
      $fields["todo"] = Array('todo_access','todo_id');
@@ -1065,6 +1065,28 @@
 		$phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.10pre10';
   }
 
+	$test[] = '0.9.10pre10';
+	function upgrade0_9_10pre10()
+	{
+		global $phpgw_info, $phpgw_setup;
+
+		$phpgw_setup->db->query("create table phpgw_temp as select acl_appname,acl_location,acl_account,"
+                            . "acl_right from phpgw_acl",__LINE__,__FILE__);
+
+		$sql = "CREATE TABLE phpgw_acl (
+			acl_appname       varchar(50),
+			acl_location      varchar(255),
+			acl_account       int,
+			acl_rights        int
+		)";
+		$phpgw_setup->db->query($sql);  
+
+		$phpgw_setup->db->query("insert into phpgw_acl select * from phpgw_temp",__LINE__,__FILE__);
+		$phpgw_setup->db->query("drop table phpgw_temp",__LINE__,__FILE__);
+     
+		$phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.10pre11';
+	}
+
   reset ($test);
   while (list ($key, $value) = each ($test)){
     if ($phpgw_info["setup"]["currentver"]["phpgwapi"] == $value) {
diff --git a/version.inc.php b/version.inc.php
index 1daac199f9..2ea75b8506 100644
--- a/version.inc.php
+++ b/version.inc.php
@@ -11,5 +11,5 @@
 
   /* $Id$ */
 
-  $phpgw_info["server"]["versions"]["phpgwapi"] = "0.9.10pre10";
+  $phpgw_info["server"]["versions"]["phpgwapi"] = "0.9.10pre11";
   $phpgw_info["server"]["versions"]["current_header"] = "1.11";