diff --git a/install/sql/incremental/upd_0068.sql b/install/sql/incremental/upd_0068.sql
new file mode 100644
index 0000000000000000000000000000000000000000..e7a00181127bf1d992981d7e9ff664253bbb851b
--- /dev/null
+++ b/install/sql/incremental/upd_0068.sql
@@ -0,0 +1,4 @@
+ALTER TABLE  `dbispconfig`.`web_domain` ADD UNIQUE  `serverdomain` (  `server_id` ,  `domain` );
+DROP INDEX rr ON dns_rr;
+ALTER TABLE  `dns_rr` CHANGE  `name`  `name` VARCHAR( 128 ) NOT NULL ;
+CREATE INDEX `rr` ON dns_rr (`zone`,`type`,`name`);
\ No newline at end of file
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index d16adae206f557838959c8ec0ec36b7301a1f706..a6fec746d4b4dc6e01fa42505050cac587d3fd64 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -450,7 +450,7 @@ CREATE TABLE `dns_rr` (
   `stamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
   `serial` int(10) unsigned default NULL,
   PRIMARY KEY  (`id`),
-  UNIQUE KEY `rr` (`zone`,`name`,`type`,`data`)
+  KEY `rr` (`zone`,`type`,`name`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 -- --------------------------------------------------------
@@ -1867,7 +1867,8 @@ CREATE TABLE `web_domain` (
   `rewrite_rules` mediumtext,
   `added_date` date NOT NULL DEFAULT '0000-00-00',
   `added_by` varchar(255) DEFAULT NULL,
-  PRIMARY KEY  (`domain_id`)
+  PRIMARY KEY  (`domain_id`),
+  UNIQUE KEY `serverdomain` (  `server_id` ,  `domain` )
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 -- --------------------------------------------------------