diff --git a/sql/000_base_structure.sql b/sql/000_base_structure.sql
index 33f04c4e..ebddef9c 100644
--- a/sql/000_base_structure.sql
+++ b/sql/000_base_structure.sql
@@ -157,7 +157,9 @@ CREATE TABLE IF NOT EXISTS `shares_archive` (
   `time` datetime NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `share_id` (`share_id`),
-  KEY `time` (`time`)
+  KEY `time` (`time`),
+  KEY `our_result` (`our_result`),
+  KEY `username` (`username`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='Archive shares for potential later debugging purposes';
 
 CREATE TABLE IF NOT EXISTS `statistics_shares` (
diff --git a/sql/008_shares_archive_optimization.sql b/sql/008_shares_archive_optimization.sql
new file mode 100644
index 00000000..556e474a
--- /dev/null
+++ b/sql/008_shares_archive_optimization.sql
@@ -0,0 +1,4 @@
+ALTER TABLE  `shares_archive` ADD INDEX (  `username` ) ;
+ALTER TABLE  `shares_archive` ADD INDEX (  `share_id` ) ;
+ALTER TABLE  `shares_archive` ADD INDEX (  `our_result` ) ;
+ALTER TABLE  `shares_archive` ADD INDEX (  `time` ) ;