diff --git a/setup/sql/mysql_droptables.inc.php b/setup/sql/mysql_droptables.inc.php
index 66950aa419..4dc0d1df0b 100644
--- a/setup/sql/mysql_droptables.inc.php
+++ b/setup/sql/mysql_droptables.inc.php
@@ -16,9 +16,10 @@
   $db->query("DROP TABLE accounts");
   $db->query("DROP TABLE groups");
   $db->query("DROP TABLE preferences");
-  $db->query("DROP TABLE sessions");
-  $db->query("DROP TABLE app_sessions");
-  $db->query("DROP TABLE access_log");
+  $db->query("DROP TABLE phpgw_sessions");
+  $db->query("DROP TABLE phpgw_app_sessions");
+  $db->query("DROP TABLE phpgw_acl");
+  $db->query("DROP TABLE phpgw_access_log");
   $db->query("DROP TABLE profiles");
   $db->query("DROP TABLE addressbook");
   $db->query("DROP TABLE todo");
diff --git a/setup/sql/mysql_newtables.inc.php b/setup/sql/mysql_newtables.inc.php
index a2813aa278..4db453eb1f 100644
--- a/setup/sql/mysql_newtables.inc.php
+++ b/setup/sql/mysql_newtables.inc.php
@@ -64,7 +64,7 @@
   )";
   $db->query($sql);  
 
-  $sql = "CREATE TABLE sessions (
+  $sql = "CREATE TABLE phpgw_sessions (
     session_id        varchar(255) NOT NULL,
     session_lid       varchar(255),
     session_pwd       varchar(255),
@@ -75,16 +75,16 @@
   )";
   $db->query($sql);  
 
-  $sql = "CREATE TABLE acl (
-    acl_appname       varchar(50) NOT NULL,
+  $sql = "CREATE TABLE phpgw_acl (
+    acl_appname       varchar(50),
     acl_location      varchar(255),
-    acl_account       varchar(50),
-    acl_account_type  varchar(15),
+    acl_account       int,
+    acl_account_type  char(1),
     acl_rights        int
   )";
-//  $db->query($sql);  
+  $db->query($sql);  
 
-  $sql = "CREATE TABLE app_sessions (
+  $sql = "CREATE TABLE phpgw_app_sessions (
     sessionid	varchar(255) NOT NULL,
     loginid	varchar(20),
     app	varchar(20),
@@ -92,7 +92,7 @@
   )";
   $db->query($sql);  
 
-  $sql = "create table access_log (
+  $sql = "create table phpgw_access_log (
     sessionid	varchar(255),
     loginid	  varchar(30),
     ip		   varchar(30),
@@ -298,6 +298,6 @@
           )";
   $db->query($sql);
 
-  $currentver = "0.9.4";
+  $currentver = "0.9.5";
   update_version_table();
 ?>
diff --git a/setup/sql/mysql_upgrade_beta.inc.php b/setup/sql/mysql_upgrade_beta.inc.php
index 61b1e7f25a..4b60e9d57e 100644
--- a/setup/sql/mysql_upgrade_beta.inc.php
+++ b/setup/sql/mysql_upgrade_beta.inc.php
@@ -358,152 +358,194 @@
     global $currentver, $phpgw_info, $db;
 
     // The 0.9.4pre1 is only temp until release
-    //if ($currentver == "0.9.4" || ereg ("^0\.9\.5pre", $currentver)){
+    if ($currentver == "0.9.4" || ereg ("^0\.9\.5pre", $currentver)){
       if ($currentver == "0.9.4") {
-        $currentver = "0.9.4pre1";
-        
         $db->query("delete from languages");
-
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('aa','Afar','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ab','Abkhazian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('af','Afrikaans','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('am','Amharic','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ar','Arabic','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('as','Assamese','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ay','Aymara','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('az','Azerbaijani','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ba','Bashkir','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('be','Byelorussian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('bg','Bulgarian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('bh','Bihari','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('bi','Bislama','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('bn','Bengali / Bangla','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('bo','Tibetan','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('br','Breton','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ca','Catalan','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('co','Corsican','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('cs','Czech','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('cy','Welsh','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('da','Danish','Yes')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('de','German','Yes')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('dz','Bhutani','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('el','Greek','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('en','English / American','Yes')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('eo','Esperanto','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('es','Spanish','Yes')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('et','Estonian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('eu','Basque','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fa','Persian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fi','Finnish','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fj','Fiji','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fo','Faeroese','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fr','French','Yes')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fy','Frisian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ga','Irish','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('gd','Gaelic / Scots Gaelic','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('gl','Galician','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('gn','Guarani','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('gu','Gujarati','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ha','Hausa','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('hi','Hindi','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('hr','Croatian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('hu','Hungarian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('hy','Armenian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ia','Interlingua','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ie','Interlingue','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ik','Inupiak','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('in','Indonesian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('is','Icelandic','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('it','Italian','Yes')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('iw','Hebrew','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ja','Japanese','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ji','Yiddish','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('jw','Javanese','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ka','Georgian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('kk','Kazakh','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('kl','Greenlandic','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('km','Cambodian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('kn','Kannada','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ko','Korean','Yes')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ks','Kashmiri','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ku','Kurdish','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ky','Kirghiz','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('la','Latin','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ln','Lingala','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('lo','Laothian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('lt','Lithuanian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('lv','Latvian / Lettish','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mg','Malagasy','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mi','Maori','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mk','Macedonian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ml','Malayalam','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mn','Mongolian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mo','Moldavian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mr','Marathi','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ms','Malay','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mt','Maltese','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('my','Burmese','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('na','Nauru','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ne','Nepali','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('nl','Dutch','Yes')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('no','Norwegian','Yes')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('oc','Occitan','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('om','Oromo / Afan','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('or','Oriya','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('pa','Punjabi','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('pl','Polish','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ps','Pashto / Pushto','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('pt','Portuguese','Yes')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('qu','Quechua','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('rm','Rhaeto-Romance','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('rn','Kirundi','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ro','Romanian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ru','Russian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('rw','Kinyarwanda','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sa','Sanskrit','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sd','Sindhi','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sg','Sangro','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sh','Serbo-Croatian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('si','Singhalese','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sk','Slovak','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sl','Slovenian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sm','Samoan','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sn','Shona','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('so','Somali','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sq','Albanian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sr','Serbian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ss','Siswati','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('st','Sesotho','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('su','Sudanese','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sv','Swedish','Yes')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sw','Swahili','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ta','Tamil','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('te','Tegulu','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tg','Tajik','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('th','Thai','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ti','Tigrinya','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tk','Turkmen','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tl','Tagalog','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tn','Setswana','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('to','Tonga','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tr','Turkish','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ts','Tsonga','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tt','Tatar','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tw','Twi','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('uk','Ukrainian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ur','Urdu','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('uz','Uzbek','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('vi','Vietnamese','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('vo','Volapuk','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('wo','Wolof','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('xh','Xhosa','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('yo','Yoruba','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('zh','Chinese','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('zu','Zulu','No')");
-        
-        
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('aa','Afar','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ab','Abkhazian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('af','Afrikaans','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('am','Amharic','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ar','Arabic','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('as','Assamese','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ay','Aymara','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('az','Azerbaijani','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ba','Bashkir','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('be','Byelorussian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('bg','Bulgarian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('bh','Bihari','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('bi','Bislama','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('bn','Bengali / Bangla','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('bo','Tibetan','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('br','Breton','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ca','Catalan','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('co','Corsican','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('cs','Czech','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('cy','Welsh','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('da','Danish','Yes')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('de','German','Yes')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('dz','Bhutani','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('el','Greek','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('en','English / American','Yes')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('eo','Esperanto','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('es','Spanish','Yes')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('et','Estonian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('eu','Basque','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fa','Persian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fi','Finnish','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fj','Fiji','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fo','Faeroese','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fr','French','Yes')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fy','Frisian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ga','Irish','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('gd','Gaelic / Scots Gaelic','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('gl','Galician','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('gn','Guarani','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('gu','Gujarati','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ha','Hausa','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('hi','Hindi','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('hr','Croatian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('hu','Hungarian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('hy','Armenian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ia','Interlingua','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ie','Interlingue','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ik','Inupiak','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('in','Indonesian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('is','Icelandic','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('it','Italian','Yes')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('iw','Hebrew','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ja','Japanese','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ji','Yiddish','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('jw','Javanese','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ka','Georgian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('kk','Kazakh','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('kl','Greenlandic','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('km','Cambodian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('kn','Kannada','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ko','Korean','Yes')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ks','Kashmiri','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ku','Kurdish','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ky','Kirghiz','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('la','Latin','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ln','Lingala','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('lo','Laothian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('lt','Lithuanian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('lv','Latvian / Lettish','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mg','Malagasy','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mi','Maori','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mk','Macedonian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ml','Malayalam','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mn','Mongolian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mo','Moldavian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mr','Marathi','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ms','Malay','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mt','Maltese','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('my','Burmese','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('na','Nauru','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ne','Nepali','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('nl','Dutch','Yes')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('no','Norwegian','Yes')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('oc','Occitan','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('om','Oromo / Afan','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('or','Oriya','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('pa','Punjabi','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('pl','Polish','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ps','Pashto / Pushto','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('pt','Portuguese','Yes')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('qu','Quechua','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('rm','Rhaeto-Romance','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('rn','Kirundi','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ro','Romanian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ru','Russian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('rw','Kinyarwanda','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sa','Sanskrit','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sd','Sindhi','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sg','Sangro','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sh','Serbo-Croatian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('si','Singhalese','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sk','Slovak','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sl','Slovenian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sm','Samoan','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sn','Shona','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('so','Somali','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sq','Albanian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sr','Serbian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ss','Siswati','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('st','Sesotho','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('su','Sudanese','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sv','Swedish','Yes')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sw','Swahili','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ta','Tamil','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('te','Tegulu','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tg','Tajik','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('th','Thai','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ti','Tigrinya','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tk','Turkmen','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tl','Tagalog','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tn','Setswana','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('to','Tonga','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tr','Turkish','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ts','Tsonga','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tt','Tatar','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tw','Twi','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('uk','Ukrainian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ur','Urdu','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('uz','Uzbek','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('vi','Vietnamese','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('vo','Volapuk','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('wo','Wolof','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('xh','Xhosa','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('yo','Yoruba','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('zh','Chinese','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('zu','Zulu','No')");
+        $currentver = "0.9.5pre1";
         update_version_table();
-      //}
+      }
+      if ($currentver == "0.9.5pre1") {
+        $db->query("DROP TABLE sessions");
+        $sql = "CREATE TABLE phpgw_sessions (
+          session_id        varchar(255) NOT NULL,
+          session_lid       varchar(255),
+          session_pwd       varchar(255),
+          session_ip        varchar(255),
+          session_logintime int(11),
+          session_dla       int(11),
+          UNIQUE sessionid (session_id)
+        )";
+        $db->query($sql);  
+      
+        $db->query("DROP TABLE acl");
+        $sql = "CREATE TABLE phpgw_acl (
+          acl_appname       varchar(50),
+          acl_location      varchar(255),
+          acl_account       int,
+          acl_account_type  char(1),
+          acl_rights        int
+        )";
+        $db->query($sql);  
+      
+        $db->query("DROP TABLE app_sessions");
+        $sql = "CREATE TABLE phpgw_app_sessions (
+          sessionid	varchar(255) NOT NULL,
+          loginid	varchar(20),
+          app	varchar(20),
+          content	text
+        )";
+        $db->query($sql);  
+      
+        $db->query("DROP TABLE access_log");
+        $sql = "create table phpgw_access_log (
+          sessionid	varchar(255),
+          loginid	  varchar(30),
+          ip		   varchar(30),
+          li		   int,
+          lo		   varchar(255)
+        )";
+        $db->query($sql);  
+
+        $currentver = "0.9.5pre2";
+        update_version_table();
+      }
+
       echo "  <tr bgcolor=\"e6e6e6\">\n";
       echo "    <td>Upgrade from 0.9.4 to $currentver is completed.</td>\n";
       echo "  </tr>\n";
diff --git a/setup/sql/pgsql_droptables.inc.php b/setup/sql/pgsql_droptables.inc.php
index 200ce652a3..a0b9474b7f 100644
--- a/setup/sql/pgsql_droptables.inc.php
+++ b/setup/sql/pgsql_droptables.inc.php
@@ -18,9 +18,10 @@
   $db->query("drop sequence groups_group_id_seq");
   $db->query("DROP TABLE groups");
   $db->query("DROP TABLE preferences");
-  $db->query("DROP TABLE sessions");
-  $db->query("DROP TABLE app_sessions");
-  $db->query("DROP TABLE access_log");
+  $db->query("DROP TABLE phpgw_sessions");
+  $db->query("DROP TABLE phpgw_app_sessions");
+  $db->query("DROP TABLE phpgw_acl");
+  $db->query("DROP TABLE phpgw_access_log");
   $db->query("drop sequence profiles_con_seq");
   $db->query("DROP TABLE profiles");
   $db->query("drop sequence addressbook_ab_id_seq");
diff --git a/setup/sql/pgsql_newtables.inc.php b/setup/sql/pgsql_newtables.inc.php
index 8f9b235de4..e131d42d2c 100644
--- a/setup/sql/pgsql_newtables.inc.php
+++ b/setup/sql/pgsql_newtables.inc.php
@@ -54,7 +54,7 @@
   )";
   $db->query($sql);
   
-  $sql = "create table sessions (
+  $sql = "create table phpgw_sessions (
     session_id         varchar(255),
     session_lid        varchar(255),
     session_pwd        varchar(255),
@@ -65,7 +65,16 @@
   )";
   $db->query($sql);
 
-  $sql = "CREATE TABLE app_sessions (
+  $sql = "CREATE TABLE phpgw_acl (
+    acl_appname       varchar(50),
+    acl_location      varchar(255),
+    acl_account       int,
+    acl_account_type  char(1),
+    acl_rights        int
+  )";
+  $db->query($sql);  
+
+  $sql = "CREATE TABLE phpgw_app_sessions (
    sessionid	varchar(255) NOT NULL,
    loginid	varchar(20),
    app	        varchar(20),
@@ -73,6 +82,15 @@
   )";
   $db->query($sql);
 
+  $sql = "create table phpgw_access_log (
+   sessionid    varchar(255),
+   loginid      varchar(30),
+   ip           varchar(30),
+   li           int,
+   lo           varchar(255)
+  )";
+  $db->query($sql);
+
   $sql = "create table preferences ( 
     preference_owner       varchar(20),
     preference_name        varchar(50),
@@ -81,15 +99,6 @@
   )";
   $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),
diff --git a/setup/sql/pgsql_upgrade_beta.inc.php b/setup/sql/pgsql_upgrade_beta.inc.php
index 7c1f862a04..c7c9733804 100644
--- a/setup/sql/pgsql_upgrade_beta.inc.php
+++ b/setup/sql/pgsql_upgrade_beta.inc.php
@@ -367,151 +367,195 @@
     global $currentver, $phpgw_info, $db;
 
     // The 0.9.4pre1 is only temp until release
-//    if ($currentver == "0.9.4" || ereg ("^0\.9\.5pre", $currentver)){
+    if ($currentver == "0.9.4" || ereg ("^0\.9\.5pre", $currentver)){
       if ($currentver == "0.9.4") {
         $db->query("delete from languages");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('aa','Afar','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ab','Abkhazian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('af','Afrikaans','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('am','Amharic','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ar','Arabic','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('as','Assamese','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ay','Aymara','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('az','Azerbaijani','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ba','Bashkir','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('be','Byelorussian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('bg','Bulgarian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('bh','Bihari','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('bi','Bislama','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('bn','Bengali / Bangla','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('bo','Tibetan','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('br','Breton','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ca','Catalan','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('co','Corsican','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('cs','Czech','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('cy','Welsh','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('da','Danish','Yes')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('de','German','Yes')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('dz','Bhutani','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('el','Greek','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('en','English / American','Yes')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('eo','Esperanto','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('es','Spanish','Yes')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('et','Estonian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('eu','Basque','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fa','Persian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fi','Finnish','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fj','Fiji','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fo','Faeroese','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fr','French','Yes')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fy','Frisian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ga','Irish','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('gd','Gaelic / Scots Gaelic','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('gl','Galician','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('gn','Guarani','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('gu','Gujarati','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ha','Hausa','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('hi','Hindi','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('hr','Croatian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('hu','Hungarian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('hy','Armenian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ia','Interlingua','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ie','Interlingue','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ik','Inupiak','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('in','Indonesian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('is','Icelandic','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('it','Italian','Yes')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('iw','Hebrew','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ja','Japanese','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ji','Yiddish','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('jw','Javanese','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ka','Georgian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('kk','Kazakh','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('kl','Greenlandic','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('km','Cambodian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('kn','Kannada','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ko','Korean','Yes')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ks','Kashmiri','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ku','Kurdish','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ky','Kirghiz','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('la','Latin','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ln','Lingala','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('lo','Laothian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('lt','Lithuanian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('lv','Latvian / Lettish','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mg','Malagasy','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mi','Maori','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mk','Macedonian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ml','Malayalam','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mn','Mongolian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mo','Moldavian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mr','Marathi','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ms','Malay','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mt','Maltese','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('my','Burmese','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('na','Nauru','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ne','Nepali','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('nl','Dutch','Yes')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('no','Norwegian','Yes')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('oc','Occitan','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('om','Oromo / Afan','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('or','Oriya','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('pa','Punjabi','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('pl','Polish','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ps','Pashto / Pushto','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('pt','Portuguese','Yes')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('qu','Quechua','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('rm','Rhaeto-Romance','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('rn','Kirundi','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ro','Romanian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ru','Russian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('rw','Kinyarwanda','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sa','Sanskrit','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sd','Sindhi','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sg','Sangro','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sh','Serbo-Croatian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('si','Singhalese','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sk','Slovak','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sl','Slovenian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sm','Samoan','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sn','Shona','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('so','Somali','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sq','Albanian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sr','Serbian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ss','Siswati','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('st','Sesotho','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('su','Sudanese','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sv','Swedish','Yes')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sw','Swahili','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ta','Tamil','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('te','Tegulu','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tg','Tajik','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('th','Thai','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ti','Tigrinya','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tk','Turkmen','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tl','Tagalog','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tn','Setswana','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('to','Tonga','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tr','Turkish','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ts','Tsonga','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tt','Tatar','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tw','Twi','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('uk','Ukrainian','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ur','Urdu','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('uz','Uzbek','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('vi','Vietnamese','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('vo','Volapuk','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('wo','Wolof','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('xh','Xhosa','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('yo','Yoruba','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('zh','Chinese','No')");
+        @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('zu','Zulu','No')");
 
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('aa','Afar','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ab','Abkhazian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('af','Afrikaans','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('am','Amharic','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ar','Arabic','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('as','Assamese','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ay','Aymara','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('az','Azerbaijani','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ba','Bashkir','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('be','Byelorussian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('bg','Bulgarian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('bh','Bihari','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('bi','Bislama','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('bn','Bengali / Bangla','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('bo','Tibetan','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('br','Breton','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ca','Catalan','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('co','Corsican','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('cs','Czech','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('cy','Welsh','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('da','Danish','Yes')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('de','German','Yes')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('dz','Bhutani','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('el','Greek','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('en','English / American','Yes')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('eo','Esperanto','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('es','Spanish','Yes')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('et','Estonian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('eu','Basque','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fa','Persian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fi','Finnish','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fj','Fiji','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fo','Faeroese','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fr','French','Yes')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('fy','Frisian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ga','Irish','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('gd','Gaelic / Scots Gaelic','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('gl','Galician','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('gn','Guarani','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('gu','Gujarati','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ha','Hausa','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('hi','Hindi','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('hr','Croatian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('hu','Hungarian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('hy','Armenian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ia','Interlingua','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ie','Interlingue','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ik','Inupiak','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('in','Indonesian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('is','Icelandic','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('it','Italian','Yes')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('iw','Hebrew','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ja','Japanese','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ji','Yiddish','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('jw','Javanese','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ka','Georgian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('kk','Kazakh','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('kl','Greenlandic','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('km','Cambodian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('kn','Kannada','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ko','Korean','Yes')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ks','Kashmiri','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ku','Kurdish','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ky','Kirghiz','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('la','Latin','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ln','Lingala','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('lo','Laothian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('lt','Lithuanian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('lv','Latvian / Lettish','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mg','Malagasy','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mi','Maori','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mk','Macedonian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ml','Malayalam','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mn','Mongolian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mo','Moldavian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mr','Marathi','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ms','Malay','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('mt','Maltese','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('my','Burmese','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('na','Nauru','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ne','Nepali','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('nl','Dutch','Yes')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('no','Norwegian','Yes')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('oc','Occitan','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('om','Oromo / Afan','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('or','Oriya','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('pa','Punjabi','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('pl','Polish','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ps','Pashto / Pushto','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('pt','Portuguese','Yes')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('qu','Quechua','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('rm','Rhaeto-Romance','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('rn','Kirundi','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ro','Romanian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ru','Russian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('rw','Kinyarwanda','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sa','Sanskrit','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sd','Sindhi','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sg','Sangro','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sh','Serbo-Croatian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('si','Singhalese','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sk','Slovak','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sl','Slovenian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sm','Samoan','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sn','Shona','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('so','Somali','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sq','Albanian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sr','Serbian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ss','Siswati','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('st','Sesotho','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('su','Sudanese','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sv','Swedish','Yes')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('sw','Swahili','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ta','Tamil','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('te','Tegulu','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tg','Tajik','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('th','Thai','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ti','Tigrinya','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tk','Turkmen','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tl','Tagalog','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tn','Setswana','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('to','Tonga','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tr','Turkish','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ts','Tsonga','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tt','Tatar','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('tw','Twi','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('uk','Ukrainian','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ur','Urdu','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('uz','Uzbek','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('vi','Vietnamese','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('vo','Volapuk','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('wo','Wolof','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('xh','Xhosa','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('yo','Yoruba','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('zh','Chinese','No')");
-  @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('zu','Zulu','No')");
-
-
-        $currentver = "0.9.4pre1";
+        $currentver = "0.9.5pre1";
         update_version_table();
-//      }
+      }
+      if ($currentver == "0.9.5pre1") {
+        $db->query("DROP TABLE sessions");
+        $sql = "create table phpgw_sessions (
+          session_id         varchar(255),
+          session_lid        varchar(255),
+          session_pwd        varchar(255),
+          session_ip         varchar(255),
+          session_logintime	 int,
+          session_dla        int,
+          unique(session_id)
+        )";
+        $db->query($sql);
+      
+        $db->query("DROP TABLE acl");
+        $sql = "CREATE TABLE phpgw_acl (
+          acl_appname       varchar(50),
+          acl_location      varchar(255),
+          acl_account       int,
+          acl_account_type  char(1),
+          acl_rights        int
+        )";
+        $db->query($sql);  
+      
+        $db->query("DROP TABLE app_sessions");
+        $sql = "CREATE TABLE phpgw_app_sessions (
+          sessionid	varchar(255) NOT NULL,
+          loginid	varchar(20),
+          app	        varchar(20),
+          content	text
+        )";
+        $db->query($sql);
+      
+        $db->query("DROP TABLE access_log");
+        $sql = "create table phpgw_access_log (
+          sessionid    varchar(255),
+          loginid      varchar(30),
+          ip           varchar(30),
+          li           int,
+          lo           varchar(255)
+        )";
+        $db->query($sql);
+
+        $currentver = "0.9.5pre2";
+        update_version_table();
+      }
+
       echo "  <tr bgcolor=\"e6e6e6\">\n";
       echo "    <td>Upgrade from 0.9.4 to $currentver is completed.</td>\n";
       echo "  </tr>\n";
diff --git a/version.inc.php b/version.inc.php
index ce0210af56..363924b97a 100644
--- a/version.inc.php
+++ b/version.inc.php
@@ -11,5 +11,5 @@
 
   /* $Id$ */
 
-  $phpgw_info["server"]["version"] = "0.9.4pre1";  
+  $phpgw_info["server"]["version"] = "0.9.5pre2";  
 ?>