diff --git a/src/bamboo/task/CdxIndexer.java b/src/bamboo/task/CdxIndexer.java
index 118fa20c..6114100a 100644
--- a/src/bamboo/task/CdxIndexer.java
+++ b/src/bamboo/task/CdxIndexer.java
@@ -24,17 +24,23 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
 import java.util.regex.Pattern;
 import java.util.zip.ZipException;
 
 public class CdxIndexer implements Runnable {
     private static final int BATCH_SIZE = 1024;
     private final DbPool dbPool;
+    private final List<Consumer<Long>> warcIndexedListeners = new ArrayList<>();
 
     public CdxIndexer(DbPool dbPool) {
         this.dbPool = dbPool;
     }
 
+    public void onWarcIndexed(Consumer<Long> callback) {
+        warcIndexedListeners.add(callback);
+    }
+
     public void run() {
         while (true) {
             List<Db.Warc> warcs;
@@ -164,6 +170,13 @@ private void indexWarc(Db.Warc warc) throws IOException {
             });
         }
         System.out.println("Finished CDX indexing " + warc.id + " " + warc.path + " (" + stats.records + " records with " + stats.bytes + " bytes)");
+        sendWarcIndexedNotification(warc.id);
+    }
+
+    private void sendWarcIndexedNotification(long warcId) {
+        for (Consumer<Long> listener : warcIndexedListeners) {
+            listener.accept(warcId);
+        }
     }
 
     void indexWarc(long warcId) throws IOException {
diff --git a/src/bamboo/task/Taskmaster.java b/src/bamboo/task/Taskmaster.java
index 85a18b2b..73bbc7cd 100644
--- a/src/bamboo/task/Taskmaster.java
+++ b/src/bamboo/task/Taskmaster.java
@@ -15,8 +15,15 @@ public class Taskmaster {
     public Taskmaster(Config config, DbPool dbPool) {
         importer = new Task(new Importer(config, dbPool, this::startIndexing));
         tasks.add(importer);
-        indexers.add(new Task(new CdxIndexer(dbPool)));
-        indexers.add(new Task(new SolrIndexer(dbPool)));
+
+        Task solrIndexerTask = new Task(new SolrIndexer(dbPool));
+
+        CdxIndexer cdxIndexer = new CdxIndexer(dbPool);
+        cdxIndexer.onWarcIndexed(warcId -> solrIndexerTask.start());
+
+        indexers.add(new Task(cdxIndexer));
+        indexers.add(solrIndexerTask);
+
         tasks.addAll(indexers);
     }