diff --git a/sql/patch_2010-06-17.sql b/sql/patch_2010-06-17.sql
new file mode 100644
index 0000000000000000000000000000000000000000..845feac54365a12f594def8f7c2d3bee3a96649a
--- /dev/null
+++ b/sql/patch_2010-06-17.sql
@@ -0,0 +1,3 @@
+    # Fixing the claim_analysis_status index:
+ALTER TABLE analysis_job DROP INDEX claim_analysis_status;
+ALTER TABLE analysis_job ADD INDEX claim_analysis_status  (job_claim, analysis_id, status, semaphore_count);
diff --git a/sql/tables.sql b/sql/tables.sql
index 2dc25f96fe962d098a66e4ab68ab58703f3dc7e0..b764ccf1b2310bf00ff5cc70a3d37f769f7f0af9 100644
--- a/sql/tables.sql
+++ b/sql/tables.sql
@@ -140,7 +140,7 @@ CREATE TABLE analysis_job (
 
   PRIMARY KEY                  (analysis_job_id),
   UNIQUE KEY input_id_analysis (input_id, analysis_id),
-  INDEX claim_analysis_status  (job_claim, analysis_id, status),
+  INDEX claim_analysis_status  (job_claim, analysis_id, status, semaphore_count),
   INDEX analysis_status        (analysis_id, status, semaphore_count),
   INDEX worker_id              (worker_id)
 ) ENGINE=InnoDB;