diff --git a/setup/sql/mysql_newtables.inc.php b/setup/sql/mysql_newtables.inc.php
index 7281856996..1cf2986f04 100644
--- a/setup/sql/mysql_newtables.inc.php
+++ b/setup/sql/mysql_newtables.inc.php
@@ -300,7 +300,7 @@
          );";
   $phpgw_setup->db->query($sql); 
 
-  $phpgw_info["setup"]["currentver"]["phpgwapi"] = "0.9.8pre5";
+  $phpgw_info["setup"]["currentver"]["phpgwapi"] = "0.9.9";
   $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 afbd8defe6..826f5b3caa 100644
--- a/setup/sql/mysql_upgrade_beta.inc.php
+++ b/setup/sql/mysql_upgrade_beta.inc.php
@@ -788,6 +788,11 @@
     $phpgw_info["setup"]["currentver"]["phpgwapi"] = "0.9.9pre1";
   }
 
+  $test[] = "0.9.9pre1";
+  function upgrade0_9_9pre1(){
+    global $phpgw_info, $phpgw_setup;
+    $phpgw_info["setup"]["currentver"]["phpgwapi"] = "0.9.9";
+  }
 
   reset ($test);
   while (list ($key, $value) = each ($test)){
diff --git a/setup/sql/pgsql_droptables.inc.php b/setup/sql/pgsql_droptables.inc.php
index a037c61286..1b5c27c3e6 100644
--- a/setup/sql/pgsql_droptables.inc.php
+++ b/setup/sql/pgsql_droptables.inc.php
@@ -40,6 +40,8 @@
   $phpgw_setup->db->query("DROP TABLE languages");
   $phpgw_setup->db->query("drop sequence categories_cat_id_seq");
   $phpgw_setup->db->query("DROP TABLE categories");
+  $phpgw_setup->db->query("drop sequence phpgw_categories_cat_id_seq");
+  $phpgw_setup->db->query("DROP TABLE phpgw_categories");
   $phpgw_setup->db->query("DROP sequence notes_note_id_seq");
   $phpgw_setup->db->query("DROP TABLE notes");
 ?>
\ No newline at end of file
diff --git a/setup/sql/pgsql_newtables.inc.php b/setup/sql/pgsql_newtables.inc.php
index f4602366d0..20e09e9043 100644
--- a/setup/sql/pgsql_newtables.inc.php
+++ b/setup/sql/pgsql_newtables.inc.php
@@ -272,7 +272,7 @@
           );";
   $phpgw_setup->db->query($sql);  
 
-  $phpgw_info["setup"]["currentver"]["phpgwapi"] = "0.9.8pre5";
+  $phpgw_info["setup"]["currentver"]["phpgwapi"] = "0.9.9";
   $phpgw_info["setup"]["oldver"]["phpgwapi"] = $phpgw_info["setup"]["currentver"]["phpgwapi"];
   update_version_table();
 ?>
\ No newline at end of file
diff --git a/setup/sql/pgsql_upgrade_beta.inc.php b/setup/sql/pgsql_upgrade_beta.inc.php
index 1a8397f140..d231b37763 100644
--- a/setup/sql/pgsql_upgrade_beta.inc.php
+++ b/setup/sql/pgsql_upgrade_beta.inc.php
@@ -813,6 +813,12 @@
     $phpgw_info["setup"]["currentver"]["phpgwapi"] = "0.9.9pre1";
   }
 
+  $test[] = "0.9.9pre1";
+  function upgrade0_9_9pre1(){
+    global $phpgw_info, $phpgw_setup;
+    $phpgw_info["setup"]["currentver"]["phpgwapi"] = "0.9.9";
+  }
+
   reset ($test);
   while (list ($key, $value) = each ($test)){
     if ($phpgw_info["setup"]["currentver"]["phpgwapi"] == $value) {