diff --git a/setup/sql/common_default_records.inc.php b/setup/sql/common_default_records.inc.php
index b0bb3a49ea..8c57e4bc80 100644
--- a/setup/sql/common_default_records.inc.php
+++ b/setup/sql/common_default_records.inc.php
@@ -111,6 +111,7 @@
   $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('cron_apps', 'cron_apps', 0, 0, NULL, '".$currentver."')");
   $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('weather', 'Weather', 1, 12, NULL, '".$currentver."')");
   $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('transy', 'Translation Management', 1, 13, NULL, '".$currentver."')");
+  $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('notes', 'Notes', 1, 13, NULL, '".$phpgw_info["server"]["version"]."')");
 
   $db->query("insert into groups (group_name) values ('Default')");  
   $db->query("insert into accounts (account_lid,account_pwd,account_firstname,account_lastname,account_permissions,account_groups,account_status) values ('demo','81dc9bdb52d04dc20036dbd8313ed055','Demo','Account',':admin:email:todo:addressbook:calendar:',',1:0,','A')");
diff --git a/setup/sql/mysql_droptables.inc.php b/setup/sql/mysql_droptables.inc.php
index 8cf25b8b23..66950aa419 100644
--- a/setup/sql/mysql_droptables.inc.php
+++ b/setup/sql/mysql_droptables.inc.php
@@ -32,4 +32,5 @@
   $db->query("DROP TABLE languages");
   $db->query("DROP TABLE customers");
   $db->query("DROP TABLE categories");
+  $db->query("DROP TABLE notes");
 ?>
\ No newline at end of file
diff --git a/setup/sql/mysql_newtables.inc.php b/setup/sql/mysql_newtables.inc.php
index e3340130f5..d2535cb055 100644
--- a/setup/sql/mysql_newtables.inc.php
+++ b/setup/sql/mysql_newtables.inc.php
@@ -278,7 +278,17 @@
      PRIMARY KEY (lang_id)
   )";
   $db->query($sql);
-  
+
+  $sql = "CREATE TABLE notes (
+     accountid      int(11),
+     date           int(11),
+     note           text, 
+     noteid         int(20) auto_increment, 
+     PRIMARY KEY (noteid)
+  )";
+  $db->query($sql);
+  $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('notes', 'Notes', 0, 13, NULL, '".$phpgw_info["server"]["version"]."')");
+
   $currentver = "0.9.3";
   update_version_table();
 ?>
diff --git a/setup/sql/mysql_upgrade_beta.inc.php b/setup/sql/mysql_upgrade_beta.inc.php
index fbe761919d..4a07fbf0b1 100644
--- a/setup/sql/mysql_upgrade_beta.inc.php
+++ b/setup/sql/mysql_upgrade_beta.inc.php
@@ -308,8 +308,21 @@
     // The 0.9.3pre1 is only temp until release
     if ($currentver == "0.9.3" || ereg ("^0\.9\.4pre", $currentver)){
       if ($currentver == "0.9.3") {
-         $currentver = "0.9.4pre1";
-         update_version_table();
+        $currentver = "0.9.4pre1";
+        update_version_table();
+      }
+      if ($currentver == "0.9.4pre1") {
+          $sql = "CREATE TABLE notes (
+            accountid      int(11),
+            date           int(11),
+            note           text, 
+            noteid         int(20) auto_increment, 
+            PRIMARY KEY (noteid)
+          )";
+        $db->query($sql);
+        $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('notes', 'Notes', 1, 13, NULL, '".$phpgw_info["server"]["version"]."')");
+        $currentver = "0.9.4pre2";
+        update_version_table();
       }
       echo "  <tr bgcolor=\"e6e6e6\">\n";
       echo "    <td>Upgrade from 0.9.3 to $currentver is completed.</td>\n";
diff --git a/setup/sql/pgsql_droptables.inc.php b/setup/sql/pgsql_droptables.inc.php
index 8453a2f50a..200ce652a3 100644
--- a/setup/sql/pgsql_droptables.inc.php
+++ b/setup/sql/pgsql_droptables.inc.php
@@ -40,4 +40,5 @@
   $db->query("DROP TABLE languages");
   $db->query("drop sequence categories_cat_id_seq");
   $db->query("DROP TABLE categories");
+  $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 01ba3e851b..bc04421ea7 100644
--- a/setup/sql/pgsql_newtables.inc.php
+++ b/setup/sql/pgsql_newtables.inc.php
@@ -251,6 +251,14 @@
   )";
   $db->query($sql);
 
+  $sql = "CREATE TABLE notes (
+     accountid      int(11),
+     date           int(11),
+     note           text, 
+     noteid         int(20) auto_increment, 
+     PRIMARY KEY (noteid)
+  )";
+  $db->query($sql);
 
   $currentver = "0.9.3";
   update_version_table();
diff --git a/setup/sql/pgsql_upgrade_beta.inc.php b/setup/sql/pgsql_upgrade_beta.inc.php
index f14c7ce948..09a7ac6684 100644
--- a/setup/sql/pgsql_upgrade_beta.inc.php
+++ b/setup/sql/pgsql_upgrade_beta.inc.php
@@ -313,6 +313,19 @@
          $currentver = "0.9.4pre1";
          update_version_table();
       }
+      if ($currentver == "0.9.4pre1") {
+        $sql = "CREATE TABLE notes (
+           accountid      int(11),
+           date           int(11),
+           note           text, 
+           noteid         int(20) auto_increment, 
+           PRIMARY KEY (noteid)
+        )";
+        $db->query($sql);
+        $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('notes', 'Notes', 1, 13, NULL, '".$phpgw_info["server"]["version"]."')");
+        $currentver = "0.9.4pre2";
+        update_version_table();
+      }
       echo "  <tr bgcolor=\"e6e6e6\">\n";
       echo "    <td>Upgrade from 0.9.3 to $currentver is completed.</td>\n";
       echo "  </tr>\n";
diff --git a/version.inc.php b/version.inc.php
index a9e6969bee..7323414ea1 100644
--- a/version.inc.php
+++ b/version.inc.php
@@ -1 +1 @@
-<?php  $phpgw_info["server"]["version"] = "0.9.4pre1"; ?>
+<?php  $phpgw_info["server"]["version"] = "0.9.4pre2"; ?>