diff --git a/docs/VERSION-NAME.txt b/docs/VERSION-NAME.txt
index c814f27..93df49a 100644
--- a/docs/VERSION-NAME.txt
+++ b/docs/VERSION-NAME.txt
@@ -1 +1 @@
-3.0.1.5 (internal release)
+3.0.1.6 (internal release)
diff --git a/docs/VERSION.txt b/docs/VERSION.txt
index 4913c2b..e11b4ff 100644
--- a/docs/VERSION.txt
+++ b/docs/VERSION.txt
@@ -1 +1 @@
-3.0.1.5
+3.0.1.6
diff --git a/sql/mysql/install/data.sql b/sql/mysql/install/data.sql
index 530d05e..032b232 100644
--- a/sql/mysql/install/data.sql
+++ b/sql/mysql/install/data.sql
@@ -3,14 +3,13 @@
 -- http://www.phpmyadmin.net
 -- 
 -- Host: localhost
--- Generation Time: Apr 18, 2006 at 12:39 PM
+-- Generation Time: Apr 20, 2006 at 02:24 PM
 -- Server version: 5.0.18
 -- PHP Version: 4.4.2-1
 
 SET FOREIGN_KEY_CHECKS=0;
-
 -- 
--- Database: `dms`
+-- Database: `ktpristine`
 -- 
 
 -- 
@@ -689,7 +688,7 @@ INSERT INTO `status_lookup` VALUES (5, 'Incomplete');
 -- 
 
 INSERT INTO `system_settings` VALUES (1, 'lastIndexUpdate', '0');
-INSERT INTO `system_settings` VALUES (2, 'knowledgeTreeVersion', '3.0.1.5');
+INSERT INTO `system_settings` VALUES (2, 'knowledgeTreeVersion', '3.0.1.6');
 INSERT INTO `system_settings` VALUES (3, 'databaseVersion', '2.99.5');
 
 -- 
@@ -812,6 +811,8 @@ INSERT INTO `upgrades` VALUES (80, 'func*3.0.1.4*0*createWorkflowPermission', 'C
 INSERT INTO `upgrades` VALUES (81, 'upgrade*3.0.1.4*99*upgrade3.0.1.4', 'Upgrade from version 3.0.1.2 to 3.0.1.4', '2006-04-18 11:06:34', 1, 'upgrade*3.0.1.4*99*upgrade3.0.1.4');
 INSERT INTO `upgrades` VALUES (82, 'sql*3.0.1.5*0*3.0.1.5/anonymous-user.sql', 'Database upgrade to version 3.0.1.5: Anonymous-user', '2006-04-18 12:38:41', 1, 'upgrade*3.0.1.5*99*upgrade3.0.1.5');
 INSERT INTO `upgrades` VALUES (83, 'upgrade*3.0.1.5*99*upgrade3.0.1.5', 'Upgrade from version 3.0.1.4 to 3.0.1.5', '2006-04-18 12:38:41', 1, 'upgrade*3.0.1.5*99*upgrade3.0.1.5');
+INSERT INTO `upgrades` VALUES (84, 'sql*3.0.1.6*0*3.0.1.6/workflow-into-metadata.sql', 'Database upgrade to version 3.0.1.6: Workflow-into-metadata', '2006-04-20 14:22:24', 1, 'upgrade*3.0.1.6*99*upgrade3.0.1.6');
+INSERT INTO `upgrades` VALUES (85, 'upgrade*3.0.1.6*99*upgrade3.0.1.6', 'Upgrade from version 3.0.1.5 to 3.0.1.6', '2006-04-20 14:22:24', 1, 'upgrade*3.0.1.6*99*upgrade3.0.1.6');
 
 -- 
 -- Dumping data for table `user_history`
@@ -1251,7 +1252,7 @@ INSERT INTO `zseq_units_organisations_link` VALUES (1);
 -- Dumping data for table `zseq_upgrades`
 -- 
 
-INSERT INTO `zseq_upgrades` VALUES (83);
+INSERT INTO `zseq_upgrades` VALUES (85);
 
 -- 
 -- Dumping data for table `zseq_user_history`
diff --git a/sql/mysql/install/structure.sql b/sql/mysql/install/structure.sql
index 5a79ab5..ebf3a53 100644
--- a/sql/mysql/install/structure.sql
+++ b/sql/mysql/install/structure.sql
@@ -3,14 +3,13 @@
 -- http://www.phpmyadmin.net
 -- 
 -- Host: localhost
--- Generation Time: Apr 18, 2006 at 12:39 PM
+-- Generation Time: Apr 20, 2006 at 02:23 PM
 -- Server version: 5.0.18
 -- PHP Version: 4.4.2-1
 
 SET FOREIGN_KEY_CHECKS=0;
-
 -- 
--- Database: `dms`
+-- Database: `ktpristine`
 -- 
 
 -- --------------------------------------------------------
@@ -280,13 +279,17 @@ CREATE TABLE `document_metadata_version` (
   `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',
+  `workflow_id` int(11) default NULL,
+  `workflow_state_id` int(11) default NULL,
   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`)
+  KEY `content_version_id` (`content_version_id`),
+  KEY `workflow_id` (`workflow_id`),
+  KEY `workflow_state_id` (`workflow_state_id`)
 ) TYPE=InnoDB;
 
 -- --------------------------------------------------------
@@ -2106,7 +2109,7 @@ CREATE TABLE `zseq_units_organisations_link` (
 CREATE TABLE `zseq_upgrades` (
   `id` int(10) unsigned NOT NULL auto_increment,
   PRIMARY KEY  (`id`)
-) TYPE=MyISAM AUTO_INCREMENT=84 ;
+) TYPE=MyISAM AUTO_INCREMENT=86 ;
 
 -- --------------------------------------------------------
 
@@ -2205,10 +2208,12 @@ ALTER TABLE `document_fields_link`
 -- Constraints for table `document_metadata_version`
 -- 
 ALTER TABLE `document_metadata_version`
+  ADD CONSTRAINT `document_metadata_version_ibfk_9` FOREIGN KEY (`workflow_state_id`) REFERENCES `workflow_states` (`id`),
   ADD CONSTRAINT `document_metadata_version_ibfk_4` FOREIGN KEY (`document_id`) REFERENCES `documents` (`id`) ON DELETE CASCADE,
   ADD CONSTRAINT `document_metadata_version_ibfk_5` FOREIGN KEY (`document_type_id`) REFERENCES `document_types_lookup` (`id`),
   ADD CONSTRAINT `document_metadata_version_ibfk_6` FOREIGN KEY (`status_id`) REFERENCES `status_lookup` (`id`),
-  ADD CONSTRAINT `document_metadata_version_ibfk_7` FOREIGN KEY (`version_creator_id`) REFERENCES `users` (`id`);
+  ADD CONSTRAINT `document_metadata_version_ibfk_7` FOREIGN KEY (`version_creator_id`) REFERENCES `users` (`id`),
+  ADD CONSTRAINT `document_metadata_version_ibfk_8` FOREIGN KEY (`workflow_id`) REFERENCES `workflows` (`id`);
 
 -- 
 -- Constraints for table `document_type_fieldsets_link`