diff --git a/setup/sql/mysql_upgrade_beta.inc.php b/setup/sql/mysql_upgrade_beta.inc.php
index 8543fc7e2c..103880593f 100644
--- a/setup/sql/mysql_upgrade_beta.inc.php
+++ b/setup/sql/mysql_upgrade_beta.inc.php
@@ -550,20 +550,19 @@
       echo "  </tr>\n";
     }
   }
-  function v0_9_5to0_9_6(){
+
+  function v0_9_5to0_9_6()
+  {
     global $currentver, $phpgw_info, $db;
 
-    if ($currentver == "0.9.5" || ereg ("^0\.9\.6pre", $currentver)){
-      if ($currentver == "0.9.5") {
-        $currentver = "0.9.6";
-        update_version_table();
-      }
+    $currentver = "0.9.6";
+    update_version_table();
 
-      echo "  <tr bgcolor=\"e6e6e6\">\n";
-      echo "    <td>Upgrade from 0.9.5 to $currentver is completed.</td>\n";
-      echo "  </tr>\n";
-    }
+    echo "  <tr bgcolor=\"e6e6e6\">\n";
+    echo "    <td>Upgrade from 0.9.5 to $currentver is completed.</td>\n";
+    echo "  </tr>\n";
   }
+
   function v0_9_6to0_9_7(){
     global $currentver, $phpgw_info, $db;
 
diff --git a/setup/sql/pgsql_upgrade_beta.inc.php b/setup/sql/pgsql_upgrade_beta.inc.php
index 361b24f8f5..3e4a520664 100644
--- a/setup/sql/pgsql_upgrade_beta.inc.php
+++ b/setup/sql/pgsql_upgrade_beta.inc.php
@@ -560,23 +560,19 @@
       echo "  </tr>\n";
     }
   }
-  function v0_9_5to0_9_6(){
+
+  function v0_9_5to0_9_6()
+  {
     global $currentver, $phpgw_info, $db;
 
-    if ($currentver == "0.9.5" || ereg ("^0\.9\.6pre", $currentver)){
-      if ($currentver == "0.9.5") {
-      // upgrade code starts here
+    $currentver = "0.9.6";
+    update_version_table();
 
-      // upgrade code ends here
-        $currentver = "0.9.6";
-        update_version_table();
-      }
-
-      echo "  <tr bgcolor=\"e6e6e6\">\n";
-      echo "    <td>Upgrade from 0.9.5 to $currentver is completed.</td>\n";
-      echo "  </tr>\n";
-    }
+    echo "  <tr bgcolor=\"e6e6e6\">\n";
+    echo "    <td>Upgrade from 0.9.5 to $currentver is completed.</td>\n";
+    echo "  </tr>\n";
   }
+
   function v0_9_6to0_9_7(){
     global $currentver, $phpgw_info, $db;