diff --git a/sql/mysql/upgrade/2.99.7/10-documents_normalisation.sql b/sql/mysql/upgrade/2.99.7/10-documents_normalisation.sql
new file mode 100644
index 0000000..997b62e
--- /dev/null
+++ b/sql/mysql/upgrade/2.99.7/10-documents_normalisation.sql
@@ -0,0 +1,14 @@
+ALTER TABLE `documents` DROP COLUMN `document_type_id`; # was int(11) NOT NULL default '0'
+ALTER TABLE `documents` DROP COLUMN `size`; # was bigint(20) NOT NULL default '0'
+ALTER TABLE `documents` DROP COLUMN `description`; # was varchar(200) NOT NULL default ''
+ALTER TABLE `documents` DROP COLUMN `security`; # was int(11) NOT NULL default '0'
+ALTER TABLE `documents` DROP COLUMN `major_version`; # was int(11) NOT NULL default '0'
+ALTER TABLE `documents` DROP COLUMN `minor_version`; # was int(11) NOT NULL default '0'
+ALTER TABLE `documents` DROP COLUMN `live_document_id`; # was int(11) default NULL
+ALTER TABLE `documents` DROP COLUMN `filename`; # was text NOT NULL
+ALTER TABLE `documents` DROP COLUMN `storage_path`; # was varchar(250) default NULL
+ALTER TABLE `documents` DROP COLUMN `mime_id`; # was int(11) NOT NULL default '0'
+ALTER TABLE `documents` DROP COLUMN `name`; # was text NOT NULL
+ALTER TABLE `documents` DROP INDEX `fk_document_type_id`; # was INDEX (`document_type_id`)
+ALTER TABLE `documents` DROP INDEX `live_document_id`; # was INDEX (`live_document_id`)
+ALTER TABLE `documents` DROP INDEX `storage_path`; # was INDEX (`storage_path`)
diff --git a/sql/mysql/upgrade/2.99.7/documents_normalisation.sql b/sql/mysql/upgrade/2.99.7/documents_normalisation.sql
new file mode 100644
index 0000000..8737be7
--- /dev/null
+++ b/sql/mysql/upgrade/2.99.7/documents_normalisation.sql
@@ -0,0 +1,37 @@
+CREATE TABLE `document_content_version` (
+  `id` int(11) NOT NULL default '0',
+  `document_id` int(11) NOT NULL default '0',
+  `filename` text NOT NULL,
+  `size` bigint(20) NOT NULL default '0',
+  `mime_id` int(11) NOT NULL default '0',
+  `major_version` int(11) NOT NULL default '0',
+  `minor_version` int(11) NOT NULL default '0',
+  `storage_path` varchar(250) default NULL,
+  UNIQUE KEY `id` (`id`),
+  KEY `storage_path` (`storage_path`),
+  KEY `document_id` (`document_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `document_metadata_version` (
+  `id` int(11) NOT NULL default '0',
+  `document_id` int(11) NOT NULL default '0',
+  `content_version_id` int(11) NOT NULL default '0',
+  `document_type_id` int(11) NOT NULL default '0',
+  `name` text NOT NULL,
+  `description` varchar(200) NOT NULL default '',
+  `status_id` int(11) default NULL,
+  `metadata_version` int(11) NOT NULL default '0',
+  `version_created` datetime NOT NULL default '0000-00-00 00:00:00',
+  `version_creator_id` int(11) NOT NULL default '0',
+  UNIQUE KEY `id` (`id`),
+  KEY `fk_document_type_id` (`document_type_id`),
+  KEY `fk_status_id` (`status_id`),
+  KEY `document_id` (`document_id`),
+  KEY `version_created` (`version_created`),
+  KEY `version_creator_id` (`version_creator_id`),
+  KEY `content_version_id` (`content_version_id`),
+  CONSTRAINT `document_metadata_version_ibfk_4` FOREIGN KEY (`document_id`) REFERENCES `documents` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `document_metadata_version_ibfk_5` FOREIGN KEY (`document_type_id`) REFERENCES `document_types_lookup` (`id`),
+  CONSTRAINT `document_metadata_version_ibfk_6` FOREIGN KEY (`status_id`) REFERENCES `status_lookup` (`id`),
+  CONSTRAINT `document_metadata_version_ibfk_7` FOREIGN KEY (`version_creator_id`) REFERENCES `users` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;