diff --git a/db/migrate/20140501171906_index_filtered_fields_on_task.rb b/db/migrate/20140501171906_index_filtered_fields_on_task.rb
new file mode 100644
index 0000000..4a117b8
--- /dev/null
+++ b/db/migrate/20140501171906_index_filtered_fields_on_task.rb
@@ -0,0 +1,17 @@
+class IndexFilteredFieldsOnTask < ActiveRecord::Migration
+  def self.up
+    add_index :tasks, :requestor_id
+    add_index :tasks, :target_id
+    add_index :tasks, :target_type
+    add_index :tasks, [:target_id, :target_type]
+    add_index :tasks, :status
+  end
+
+  def self.down
+    remove_index :tasks, :requestor_id
+    remove_index :tasks, :target_id
+    remove_index :tasks, :target_type
+    remove_index :tasks, [:target_id, :target_type]
+    remove_index :tasks, :status
+  end
+end
--
libgit2 0.21.2