diff --git a/Makefile.am b/Makefile.am
index 9f7d411040ea5d4551bfada072125fd33d1c36f7..e66ff84a863e91983cb9857cfabed4dfffe95934 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,7 +82,8 @@ dist_sql_DATA = 				\
   src/sql/upgrade-10.sql			\
   src/sql/upgrade-11.sql			\
   src/sql/upgrade-12.sql			\
-  src/sql/upgrade-13.sql
+  src/sql/upgrade-13.sql			\
+  src/sql/upgrade-14.sql
 
 dist_css_DATA =					\
   src/static/css/cuirass.css			\
diff --git a/src/schema.sql b/src/schema.sql
index f98d4303d57c1491e2d1aa32a8b38c4ca2f45dfc..fb713199c20c7bfea889ff59313f917df385d513 100644
--- a/src/schema.sql
+++ b/src/schema.sql
@@ -99,6 +99,7 @@ CREATE TABLE Events (
 CREATE INDEX Builds_status_index ON Builds (status);
 CREATE INDEX Builds_evaluation_index ON Builds (evaluation, status);
 CREATE INDEX Builds_nix_name ON Builds (nix_name COLLATE NOCASE);
+CREATE INDEX Builds_timestamp_stoptime on Builds(timestamp, stoptime);
 CREATE INDEX Evaluations_status_index ON Evaluations (id, status);
 CREATE INDEX Evaluations_specification_index ON Evaluations (specification, id DESC);
 CREATE INDEX Outputs_derivation_index ON Outputs (derivation);
diff --git a/src/sql/upgrade-14.sql b/src/sql/upgrade-14.sql
new file mode 100644
index 0000000000000000000000000000000000000000..566077c72599f57c4e32d6088761dc4239fcef1f
--- /dev/null
+++ b/src/sql/upgrade-14.sql
@@ -0,0 +1,5 @@
+BEGIN TRANSACTION;
+
+CREATE INDEX Builds_timestamp_stoptime on Builds(timestamp, stoptime);
+
+COMMIT;