diff --git a/INSTALL/MIGRATE.sql b/INSTALL/MIGRATE.sql
new file mode 100644
index 000000000..920755a9a
--- /dev/null
+++ b/INSTALL/MIGRATE.sql
@@ -0,0 +1,73 @@
+-- --------------------------------------------------------
+
+--
+-- Remove the tables used for the old ACL
+--
+DROP TABLE `aros`;
+DROP TABLE `acos`;
+DROP TABLE `aros_acos`;
+
+-- --------------------------------------------------------
+
+--
+-- Alter the attributes table and set the new distribution + timestamp
+--
+
+ALTER TABLE `attributes` ADD  `timestamp` INT NOT NULL DEFAULT  '0';
+ALTER TABLE `attributes` ADD  `distribution` tinyint(4) NOT NULL DEFAULT '0';
+UPDATE `attributes` SET `distribution` = '0' WHERE `private` = '1' AND `cluster` = '0';
+UPDATE `attributes` SET `distribution` = '1' WHERE `cluster` = '1';
+UPDATE `attributes` SET `distribution` = '2' WHERE `communitie` = '1';
+UPDATE `attributes` SET `distribution` = '3' WHERE `private` = '0' AND `cluster` = '0' AND `communitie` = '0';
+UPDATE `attributes` SET `timestamp` = '1000000000' WHERE `timestamp` = '0';
+ALTER TABLE `attributes` DROP `dist_change`;
+ALTER TABLE `attributes` DROP `private`;
+ALTER TABLE `attributes` DROP `cluster`;
+ALTER TABLE `attributes` DROP `communitie`;
+ALTER TABLE `attributes` DROP `revision`;
+
+-- --------------------------------------------------------
+
+--
+-- Alter the events table and set the new distribution + timestamp
+--
+
+ALTER TABLE `events` ADD `timestamp` INT NOT NULL DEFAULT  '0';
+ALTER TABLE `events` ADD `distribution` tinyint(4) NOT NULL DEFAULT '0';
+ALTER TABLE `events` ADD `proposal_email_lock` tinyint(1) NOT NULL DEFAULT '0';
+UPDATE `events` SET `distribution` = '0' WHERE `private` = '1' AND `cluster` = '0';
+UPDATE `events` SET `distribution` = '1' WHERE `cluster` = '1';
+UPDATE `events` SET `distribution` = '2' WHERE `communitie` = '1';
+UPDATE `events` SET `distribution` = '3' WHERE `private` = '0' AND `cluster` = '0' AND `communitie` = '0';
+UPDATE `events` SET `timestamp` = '1000000000' WHERE `timestamp` = '0';
+ALTER TABLE `events` DROP `dist_change`;
+ALTER TABLE `events` DROP `private`;
+ALTER TABLE `events` DROP `cluster`;
+ALTER TABLE `events` DROP `communitie`;
+ALTER TABLE `events` DROP `revision`;
+ALTER TABLE `events` DROP `hop_count`;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `shadow_attributes`
+--
+
+CREATE TABLE IF NOT EXISTS `shadow_attributes` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `old_id` int(11) NOT NULL,
+  `event_id` int(11) NOT NULL,
+  `type` varchar(100) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
+  `category` varchar(255) COLLATE utf8_bin NOT NULL,
+  `value1` text COLLATE utf8_bin,
+  `to_ids` tinyint(1) NOT NULL DEFAULT '1',
+  `uuid` varchar(40) COLLATE utf8_bin NOT NULL,
+  `value2` text COLLATE utf8_bin,
+  `org` varchar(255) COLLATE utf8_bin NOT NULL,
+  `email` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `event_id` (`event_id`),
+  KEY `uuid` (`uuid`),
+  KEY `old_id` (`old_id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COLLATE=utf8_bin AUTO_INCREMENT=11 ;
+-- --------------------------------------------------------
\ No newline at end of file
diff --git a/INSTALL/MYSQL.sql b/INSTALL/MYSQL.sql
index 41075e66b..9d3c813e9 100755
--- a/INSTALL/MYSQL.sql
+++ b/INSTALL/MYSQL.sql
@@ -12,9 +12,7 @@ CREATE TABLE IF NOT EXISTS `attributes` (
   `value1` text COLLATE utf8_bin,
   `to_ids` tinyint(1) NOT NULL DEFAULT '1',
   `uuid` varchar(40) COLLATE utf8_bin NOT NULL,
-  `revision` int(10) NOT NULL DEFAULT '0',
   `value2` text COLLATE utf8_bin,
-  `dist_change` int(11) NOT NULL DEFAULT '0',
   `timestamp` int(11) NOT NULL DEFAULT '0',
   `distribution` tinyint(4) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
@@ -80,15 +78,13 @@ CREATE TABLE IF NOT EXISTS `events` (
   `info` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
   `user_id` int(11) NOT NULL,
   `uuid` varchar(40) COLLATE utf8_bin NOT NULL,
-  `revision` tinyint(1) NOT NULL,
   `attribute_count` int(11) NOT NULL,
-  `hop_count` int(11) NOT NULL DEFAULT '0',
   `published` tinyint(1) NOT NULL DEFAULT '0',
   `analysis` tinyint(4) NOT NULL,
   `orgc` varchar(255) COLLATE utf8_bin NOT NULL,
-  `dist_change` int(11) NOT NULL DEFAULT '0',
   `timestamp` int(11) NOT NULL DEFAULT '0',
   `distribution` tinyint(4) NOT NULL DEFAULT '0',
+  `proposal_email_lock` tinyint(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `uuid` (`uuid`),
   FULLTEXT KEY `info` (`info`)