diff --git a/install/update-6.1.0/update-sqlite3.sql b/install/update-6.1.0/update-sqlite3.sql
index fddb75038..afe9b0af7 100644
--- a/install/update-6.1.0/update-sqlite3.sql
+++ b/install/update-6.1.0/update-sqlite3.sql
@@ -31,6 +31,6 @@ CREATE TABLE `tblFolderAttributeDefinitionGroup` (
   UNIQUE(`folder`, `attrgrp`)
 );
 
-UPDATE tblVersion set major=5, minor=2, subminor=0;
+UPDATE tblVersion set major=6, minor=1, subminor=0;
 
 COMMIT;
diff --git a/install/update-6.1.0/update.sql b/install/update-6.1.0/update.sql
index e3a54d662..a0f8510c5 100644
--- a/install/update-6.1.0/update.sql
+++ b/install/update-6.1.0/update.sql
@@ -1,31 +1,31 @@
 START TRANSACTION;
 
 CREATE TABLE `tblDownloadLinks` (
-  `id` int(11) NOT NULL auto_increment,
-  `document` int(11) NOT NULL default '0',
-  `version` smallint(5) unsigned NOT NULL default '0',
-  `userID` int(11) NOT NULL default '0',
-  `hash` varchar(50) default NULL,
-  `valid` datetime default NULL,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `document` int(11) NOT NULL DEFAULT '0',
+  `version` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `userID` int(11) NOT NULL DEFAULT '0',
+  `hash` varchar(50) DEFAULT NULL,
+  `valid` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
   CONSTRAINT `tblDownloadLink_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
   CONSTRAINT `tblDownloadLink_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `tblAttributeDefinitionGroups` (
-  `id` int(11) NOT NULL auto_increment,
-  `name` varchar(100) default NULL,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) DEFAULT NULL,
   `comment` text,
   PRIMARY KEY (`id`),
-  UNIQUE(`name`)
+  UNIQUE KEY `name` (`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `tblAttributeDefinitionGroupAttributeDefinition` (
   `attrdef` int(11),
   `attrgrp` int(11),
-  `sequence` double NOT NULL default '0',
+  `sequence` double NOT NULL DEFAULT '0',
 	`show` int(11),
-  UNIQUE(`attrdef`, `attrgrp`),
+  UNIQUE KEY `attrdef` (`attrdef`,`attrgrp`),
 	CONSTRAINT `tblAttributeDefinitionGroupAttributeDefinition_attrdef` FOREIGN KEY (`attrdef`) REFERENCES `tblAttributeDefinitions` (`id`) ON DELETE CASCADE,
 	CONSTRAINT `tblAttributeDefinitionGroupAttributeDefinition_attrgrp` FOREIGN KEY (`attrgrp`) REFERENCES `tblAttributeDefinitionGroups` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -33,13 +33,13 @@ CREATE TABLE `tblAttributeDefinitionGroupAttributeDefinition` (
 CREATE TABLE `tblFolderAttributeDefinitionGroup` (
   `folder` int(11),
   `attrgrp` int(11),
-  `sequence` double NOT NULL default '0',
-  UNIQUE(`folder`, `attrgrp`),
+  `sequence` double NOT NULL DEFAULT '0',
+  UNIQUE KEY `folder` (`folder`,`attrgrp`),
 	CONSTRAINT `tblFolderAttributeDefinitionGroup_folder` FOREIGN KEY (`folder`) REFERENCES `tblFolders` (`id`) ON DELETE CASCADE,
 	CONSTRAINT `tblFolderAttributeDefinitionGroup_attrgrp` FOREIGN KEY (`attrgrp`) REFERENCES `tblAttributeDefinitionGroups` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-UPDATE tblVersion set major=5, minor=2, subminor=0;
+UPDATE tblVersion set major=6, minor=1, subminor=0;
 
 COMMIT;