diff --git a/setup/index.php b/setup/index.php
index a5418f086f..519551bc39 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -44,8 +44,6 @@
           $db->query("select app_version from applications where app_name='admin'");
           $db->next_record();
           $oldversion = $db->f("app_version");
-echo "oldversion: $oldversion<br>\n";
-
           $db->free();
           if (isset($oldversion)){
             if ($oldversion == $phpgw_info["server"]["version"]){
diff --git a/setup/sql/common_main.inc.php b/setup/sql/common_main.inc.php
index 21b5228c58..a5af962fbd 100644
--- a/setup/sql/common_main.inc.php
+++ b/setup/sql/common_main.inc.php
@@ -18,9 +18,7 @@
   }
 
   if ($currentver == "drop"){
-
     include("./sql/".$phpgw_domain[$SetupDomain]["db_type"]."_droptables.inc.php");
-//    $currentver = "new";
   }
   if ($currentver == "new") {
     include("./sql/".$phpgw_domain[$SetupDomain]["db_type"]."_newtables.inc.php");
@@ -34,9 +32,11 @@
     include("./sql/".$phpgw_domain[$SetupDomain]["db_type"]."_upgrade_beta.inc.php");
   }
 
+/* Not yet implemented
   if (!$tablechanges == True){
     echo "  <tr bgcolor=\"e6e6e6\">\n";
     echo "    <td>No table changes were needed. The script only updated your version setting.</td>\n";
     echo "  </tr>\n";
   }
+*/
 ?>
\ No newline at end of file
diff --git a/setup/sql/mysql_upgrade_beta.inc.php b/setup/sql/mysql_upgrade_beta.inc.php
index ead183b1ba..afff89bf09 100644
--- a/setup/sql/mysql_upgrade_beta.inc.php
+++ b/setup/sql/mysql_upgrade_beta.inc.php
@@ -296,9 +296,12 @@
          update_version_table();
       }
 
-      echo "  <tr bgcolor=\"e6e6e6\">\n";
-      echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
-      echo "  </tr>\n";
+      if ($oldversion != $currentver){
+        echo "  </tr><td>\n";
+        echo "  <tr bgcolor=\"e6e6e6\">\n";
+        echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
+        echo "  </tr>\n";
+      }
     }
   }
   
@@ -348,9 +351,12 @@
         $currentver = "0.9.4";
         update_version_table();
       }
-      echo "  <tr bgcolor=\"e6e6e6\">\n";
-      echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
-      echo "  </tr>\n";
+      if ($oldversion != $currentver){
+        echo "  </tr><td>\n";
+        echo "  <tr bgcolor=\"e6e6e6\">\n";
+        echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
+        echo "  </tr>\n";
+      }
     }
   }
 
@@ -545,9 +551,12 @@
         update_version_table();
       }
 
-      echo "  <tr bgcolor=\"e6e6e6\">\n";
-      echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
-      echo "  </tr>\n";
+      if ($oldversion != $currentver){
+        echo "  </tr><td>\n";
+        echo "  <tr bgcolor=\"e6e6e6\">\n";
+        echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
+        echo "  </tr>\n";
+      }
     }
   }
 
@@ -559,9 +568,12 @@
       $currentver = "0.9.6";
       update_version_table();
   
-      echo "  <tr bgcolor=\"e6e6e6\">\n";
-      echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
-      echo "  </tr>\n";
+      if ($oldversion != $currentver){
+        echo "  </tr><td>\n";
+        echo "  <tr bgcolor=\"e6e6e6\">\n";
+        echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
+        echo "  </tr>\n";
+      }
     }
   }
 
@@ -705,9 +717,12 @@
         update_version_table();
       }
 */
-      echo "  <tr bgcolor=\"e6e6e6\">\n";
-      echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
-      echo "  </tr>\n";
+      if ($oldversion != $currentver){
+        echo "  </tr><td>\n";
+        echo "  <tr bgcolor=\"e6e6e6\">\n";
+        echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
+        echo "  </tr>\n";
+      }
     }
   }
   function v0_9_8to0_9_9(){
@@ -732,9 +747,12 @@
         update_version_table();
       }
 */
-      echo "  <tr bgcolor=\"e6e6e6\">\n";
-      echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
-      echo "  </tr>\n";
+      if ($oldversion != $currentver){
+        echo "  </tr><td>\n";
+        echo "  <tr bgcolor=\"e6e6e6\">\n";
+        echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
+        echo "  </tr>\n";
+      }
     }
   }
   function v0_9_9to0_9_10(){
@@ -759,9 +777,12 @@
         update_version_table();
       }
 */
-      echo "  <tr bgcolor=\"e6e6e6\">\n";
-      echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
-      echo "  </tr>\n";
+      if ($oldversion != $currentver){
+        echo "  </tr><td>\n";
+        echo "  <tr bgcolor=\"e6e6e6\">\n";
+        echo "    <td>Upgrade from $oldversion 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 a0b9474b7f..5f30cd112d 100644
--- a/setup/sql/pgsql_droptables.inc.php
+++ b/setup/sql/pgsql_droptables.inc.php
@@ -28,10 +28,9 @@
   $db->query("DROP TABLE addressbook");
   $db->query("drop sequence webcal_entry_cal_id_seq");
   $db->query("DROP TABLE todo");
-  $db->query("DROP TABLE webcal_entry");
-  $db->query("DROP TABLE webcal_entry_repeats");
-  $db->query("DROP TABLE webcal_entry_user");
-  $db->query("DROP TABLE webcal_entry_groups");
+  $db->query("DROP TABLE calendar_entry");
+  $db->query("DROP TABLE calendar_entry_repeats");
+  $db->query("DROP TABLE calendar_entry_user");
   $db->query("drop sequence newsgroups_con_seq");
   $db->query("DROP TABLE newsgroups");
   $db->query("DROP TABLE users_newsgroups");
diff --git a/setup/sql/pgsql_newtables.inc.php b/setup/sql/pgsql_newtables.inc.php
index 7d211cd416..fec3ba0081 100644
--- a/setup/sql/pgsql_newtables.inc.php
+++ b/setup/sql/pgsql_newtables.inc.php
@@ -262,7 +262,7 @@
           )";
   $db->query($sql);
 
-  $currentver = "0.9.6";
+  $currentver = "0.9.7pre2";
+  $oldversion = $currentver;
   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 343499c493..d5abe467ff 100644
--- a/setup/sql/pgsql_upgrade_beta.inc.php
+++ b/setup/sql/pgsql_upgrade_beta.inc.php
@@ -358,9 +358,12 @@
         $currentver = "0.9.4";
         update_version_table();
       }
-      echo "  <tr bgcolor=\"e6e6e6\">\n";
-      echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
-      echo "  </tr>\n";
+      if ($oldversion != $currentver){
+        echo "  </tr><td>\n";
+        echo "  <tr bgcolor=\"e6e6e6\">\n";
+        echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
+        echo "  </tr>\n";
+      }
     }
   }
   function v0_9_4to0_9_5(){
@@ -555,9 +558,12 @@
         update_version_table();
       }
 
-      echo "  <tr bgcolor=\"e6e6e6\">\n";
-      echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
-      echo "  </tr>\n";
+      if ($oldversion != $currentver){
+        echo "  </tr><td>\n";
+        echo "  <tr bgcolor=\"e6e6e6\">\n";
+        echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
+        echo "  </tr>\n";
+      }
     }
   }
 
@@ -673,9 +679,12 @@
         update_version_table();	
       }
 
-      echo "  <tr bgcolor=\"e6e6e6\">\n";
-      echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
-      echo "  </tr>\n";
+      if ($oldversion != $currentver){
+        echo "  </tr><td>\n";
+        echo "  <tr bgcolor=\"e6e6e6\">\n";
+        echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
+        echo "  </tr>\n";
+      }
     }
   }
 
@@ -701,9 +710,12 @@
         update_version_table();
       }
 */
-      echo "  <tr bgcolor=\"e6e6e6\">\n";
-      echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
-      echo "  </tr>\n";
+      if ($oldversion != $currentver){
+        echo "  </tr><td>\n";
+        echo "  <tr bgcolor=\"e6e6e6\">\n";
+        echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
+        echo "  </tr>\n";
+      }
     }
   }
   function v0_9_8to0_9_9(){
@@ -728,9 +740,12 @@
         update_version_table();
       }
 */
-      echo "  <tr bgcolor=\"e6e6e6\">\n";
-      echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
-      echo "  </tr>\n";
+      if ($oldversion != $currentver){
+        echo "  </tr><td>\n";
+        echo "  <tr bgcolor=\"e6e6e6\">\n";
+        echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
+        echo "  </tr>\n";
+      }
     }
   }
   function v0_9_9to0_9_10(){
@@ -755,9 +770,12 @@
         update_version_table();
       }
 */
-      echo "  <tr bgcolor=\"e6e6e6\">\n";
-      echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
-      echo "  </tr>\n";
+      if ($oldversion != $currentver){
+        echo "  </tr><td>\n";
+        echo "  <tr bgcolor=\"e6e6e6\">\n";
+        echo "    <td>Upgrade from $oldversion to $currentver is completed.</td>\n";
+        echo "  </tr>\n";
+      }
     }
   }