diff --git a/src/sql/hydra.sql b/src/sql/hydra.sql
index 1ade4e38..8752bacc 100644
--- a/src/sql/hydra.sql
+++ b/src/sql/hydra.sql
@@ -594,6 +594,7 @@ create index IndexBuildProducstOnBuildAndType on BuildProducts(build, type);
 create index IndexBuildProductsOnBuild on BuildProducts(build);
 create index IndexBuildStepsOnBusy on BuildSteps(busy) where busy = 1;
 create index IndexBuildStepsOnDrvPath on BuildSteps(drvpath);
+create index IndexBuildStepsOnPropagatedFrom on BuildSteps(propagatedFrom) where propagatedFrom is not null;
 create index IndexBuildStepOutputsOnPath on BuildStepOutputs(path);
 create index IndexBuildsOnFinished on Builds(finished) where finished = 0;
 create index IndexBuildsOnFinishedBusy on Builds(finished, busy) where finished = 0;
diff --git a/src/sql/upgrade-36.sql b/src/sql/upgrade-36.sql
new file mode 100644
index 00000000..876c1c87
--- /dev/null
+++ b/src/sql/upgrade-36.sql
@@ -0,0 +1 @@
+create index IndexBuildStepsOnPropagatedFrom on BuildSteps(propagatedFrom) where propagatedFrom is not null;