diff --git search_api.drush.inc search_api.drush.inc
new file mode 100644
index 0000000..8ca3b2f
--- /dev/null
+++ search_api.drush.inc
@@ -0,0 +1,248 @@
+<?php
+
+/**
+ * @file
+ * Drush commands for SearchAPI.
+ *
+ * Original file by agentrickard for Palantir.net
+ */
+
+/**
+ * Implements hook_drush_command().
+ */
+function search_api_drush_command() {
+  $items = array();
+
+  $items['search-api-list'] = array(
+    'description' => 'List all search indexes.',
+    'examples' => array(
+      'drush searchapi-list' => dt('List all search indexes.'),
+      'drush sapi-l' => dt('Alias to list all search indexes.'),
+    ),
+    'aliases' => array('sapi-l'),
+  );
+
+  $items['search-api-status'] = array(
+    'description' => 'Show the status of one or all search indexes.',
+    'examples' => array(
+      'drush searchapi-status' => dt('Show the status of all search indexes.'),
+      'drush sapi-s' => dt('Alias to show the status of all search indexes.'),
+      'drush sapi-s 1' => dt('Show the status of the search index with the ID !id.', array('!id' => 1)),
+      'drush sapi-s default_node_index' => dt('Show the status of the search index with the machine name !name.', array('!name' => 'default_node_index')),
+    ),
+    'arguments' => array(
+      'index_id' => dt('The numeric ID or machine name of an index.'),
+    ),
+    'aliases' => array('sapi-s'),
+  );
+
+  $items['search-api-index'] = array(
+    'description' => 'Index items for one or all enabled search_api indexes.',
+    'examples' => array(
+      'drush searchapi-index' => dt('Index items for all enabled indexes.'),
+      'drush sapi-i' => dt('Alias to index items for all enabled indexes.'),
+      'drush sapi-i 1' => dt('Index items for the index with the ID !id.', array('!id' => 1)),
+      'drush sapi-i default_node_index' => dt('Index items for the index with the machine name !name.', array('!name' => 'default_node_index')),
+      'drush sapi-i 1 100' => dt('Index a maximum number of !limit items for the index with the ID !id.', array('!limit' => 100, '!id' => 1)),
+    ),
+    'arguments' => array(
+      'index_id' => dt('The numeric ID or machine name of an index.'),
+      'limit' => dt("The number of items to index. Use 0 to index all items. Defaults to the index's cron limit."),
+    ),
+    'aliases' => array('sapi-i'),
+  );
+
+  $items['search-api-reindex'] = array(
+    'description' => 'Force reindexing of one or all search indexes, without clearing existing index data.',
+    'examples' => array(
+      'drush searchapi-reindex' => dt('Schedule all search indexes for reindexing.'),
+      'drush sapi-r' => dt('Alias to schedule all search indexes for reindexing .'),
+      'drush sapi-r 1' => dt('Schedule the search index with the ID !id for re-indexing.', array('!id' => 1)),
+      'drush sapi-r default_node_index' => dt('Schedule the search index with the machine name !name for re-indexing.', array('!name' => 'default_node_index')),
+    ),
+    'arguments' => array(
+      'index_id' => dt('The numeric ID or machine name of an index.'),
+    ),
+    'aliases' => array('sapi-r'),
+  );
+
+  $items['search-api-clear'] = array(
+    'description' => 'Clear one or all search indexes and mark them for re-indexing.',
+    'examples' => array(
+      'drush searchapi-clear' => dt('Clear all search indexes.'),
+      'drush sapi-c' => dt('Alias to clear all search indexes.'),
+      'drush sapi-r 1' => dt('Clear the search index with the ID !id.', array('!id' => 1)),
+      'drush sapi-r default_node_index' => dt('Clear the search index with the machine name !name.', array('!name' => 'default_node_index')),
+    ),
+    'arguments' => array(
+      'index_id' => dt('The numeric ID or machine name of an index.'),
+    ),
+    'aliases' => array('sapi-c'),
+  );
+
+  return $items;
+}
+
+
+/**
+ * List all search indexes.
+ */
+function drush_search_api_list() {
+  if (search_api_drush_static(__FUNCTION__)) {
+    return;
+  }
+  // See search_api_list_indexes()
+  $indexes = search_api_index_load_multiple(FALSE);
+  if (empty($indexes)) {
+    drush_print(dt('There are no indexes present.'));
+    return;
+  }
+  $rows[] = array(
+    dt('Id'),
+    dt('Name'),
+    dt('Index'),
+    dt('Server'),
+    dt('Type'),
+    dt('Enabled'),
+    dt('Limit'),
+  );
+  foreach ($indexes as $key => $index) {
+    $row = array(
+      $index->id,
+      $index->name,
+      $index->machine_name,
+      $index->server,
+      $index->entity_type,
+      $index->enabled,
+      $index->options['cron_limit'],
+    );
+    $rows[] = $row;
+  }
+  drush_print_table($rows);
+}
+
+/**
+ * List index status.
+ */
+function drush_search_api_status($index_id = NULL) {
+  if (search_api_drush_static(__FUNCTION__)) {
+    return;
+  }
+  $indexes = search_api_drush_get_index($index_id);
+  if (empty($indexes)) {
+    return;
+  }
+  // See search_api_index_status()
+  $rows = array(array(
+    dt('Id'),
+    dt('Index'),
+    dt('% Complete'),
+    dt('Indexed'),
+    dt('Total'),
+  ));
+  foreach ($indexes as $index) {
+    $status = search_api_index_status($index);
+    $row = array(
+      $index->id,
+      $index->name,
+      100 * round($status['indexed'] / $status['total'], 3) . '%',
+      $status['indexed'],
+      $status['total'],
+    );
+    $rows[] = $row;
+  }
+  drush_print_table($rows);
+}
+
+/**
+ * Update indexes.
+ */
+function drush_search_api_index($index_id = NULL, $limit = NULL) {
+  if (search_api_drush_static(__FUNCTION__)) {
+    return;
+  }
+  $indexes = search_api_drush_get_index($index_id);
+  if (empty($indexes)) {
+    return;
+  }
+  $limit_string = $limit;
+  foreach ($indexes as $index) {
+    if (is_null($limit)) {
+      $limit = $index->options['cron_limit'];
+      $limit_string = $limit;
+    }
+    elseif ((int) $limit <= 0) {
+      $limit = -1;
+      $limit_string = t('all');
+    }
+    drush_print(dt('Indexing a maximum number of !limit items for index !index.', array('!index' => $index->name, '!limit' => $limit_string)));
+    search_api_index_items($index, $limit);
+  }
+}
+
+/**
+ * Mark for re-indexing.
+ */
+function drush_search_api_reindex($index_id = NULL) {
+  if (search_api_drush_static(__FUNCTION__)) {
+    return;
+  }
+  $indexes = search_api_drush_get_index($index_id);
+  if (empty($indexes)) {
+    return;
+  }
+  // See search_api_index_reindex()
+  foreach ($indexes as $index) {
+    $index->reindex();
+  }
+}
+
+/**
+ * Clear an index.
+ */
+function drush_search_api_clear($index_id = NULL) {
+  if (search_api_drush_static(__FUNCTION__)) {
+    return;
+  }
+  $indexes = search_api_drush_get_index($index_id);
+  if (empty($indexes)) {
+    return;
+  }
+  // See search_api_index_reindex()
+  foreach ($indexes as $index) {
+    $index->clear();
+  }
+}
+
+/**
+ * Helper function to return an index or all indexes as an array.
+ *
+ * @param $index_id
+ *   (optional) The provided index id.
+ *
+ * @return
+ *   An array of indexes.
+ */
+function search_api_drush_get_index($index_id = NULL) {
+  $ids = isset($index_id) ? array($index_id) : FALSE;
+  $indexes = search_api_index_load_multiple($ids);
+  if (empty($indexes)) {
+    drush_set_error(dt('Invalid index_id or no indexes present. Listing all indexes:'));
+    drush_print();
+    drush_search_api_list();
+  }
+  return $indexes;
+}
+
+/**
+ * Static lookup to prevent Drush 4 from running twice.
+ *
+ * @see http://drupal.org/node/704848 is fixed.
+ */
+function search_api_drush_static($function) {
+  static $index = array();
+  if (isset($index[$function])) {
+    return TRUE;
+  }
+  $index[$function] = TRUE;
+}