diff --git a/bin/pg_repack.c b/bin/pg_repack.c
index bdce54b..56bc2ae 100644
--- a/bin/pg_repack.c
+++ b/bin/pg_repack.c
@@ -180,7 +180,7 @@ static bool preliminary_checks(char *errbuf, size_t errsize);
 static void repack_all_databases(const char *order_by);
 static bool repack_one_database(const char *order_by, char *errbuf, size_t errsize);
 static void repack_one_table(const repack_table *table, const char *order_by);
-static bool repack_one_index(Oid table, const char *table_name, Oid index, const char *schema_name);
+static bool repack_table_indexes(PGresult *index_details);
 static bool repack_all_indexes(char *errbuf, size_t errsize);
 static void repack_cleanup(bool fatal, const repack_table *table);
 static bool rebuild_indexes(const repack_table *table);
@@ -208,7 +208,7 @@ static SimpleStringList	table_list = {NULL, NULL};
 static char				*orderby = NULL;
 static char				*tablespace = NULL;
 static bool				moveidx = false;
-static char				*r_index = NULL;
+static SimpleStringList	r_index = {NULL, NULL};
 static bool				only_indexes = false;
 static int				wait_timeout = 60;	/* in seconds */
 static int				jobs = 0;	/* number of concurrent worker conns. */
@@ -229,7 +229,7 @@ static pgut_option options[] =
 	{ 's', 'o', "order-by", &orderby },
 	{ 's', 's', "tablespace", &tablespace },
 	{ 'b', 'S', "moveidx", &moveidx },
-	{ 's', 'i', "index", &r_index },
+	{ 'l', 'i', "index", &r_index },
 	{ 'b', 'x', "only-indexes", &only_indexes },
 	{ 'i', 'T', "wait-timeout", &wait_timeout },
 	{ 'B', 'Z', "no-analyze", &analyze },
@@ -254,12 +254,12 @@ main(int argc, char *argv[])
 
 	check_tablespace();
 
-	if (r_index || only_indexes)
+	if (r_index.head || only_indexes)
 	{
-		if (r_index && table_list.head)
+		if (r_index.head && table_list.head)
 			ereport(ERROR, (errcode(EINVAL),
 				errmsg("cannot specify --index (-i) and --table (-t)")));
-		else if (r_index && only_indexes)
+		else if (r_index.head && only_indexes)
 			ereport(ERROR, (errcode(EINVAL),
 				errmsg("cannot specify --index (-i) and --only-indexes (-x)")));
 		else if (only_indexes && !table_list.head)
@@ -1606,213 +1606,198 @@ repack_cleanup(bool fatal, const repack_table *table)
 }
 
 /*
- * repack one index
+ * Indexes of a table are repacked.
  */
 static bool
-repack_one_index(Oid table, const char *table_name, Oid index, const char *schema_name)
+repack_table_indexes(PGresult *index_details)
 {
 	bool				ret = false;
 	PGresult			*res = NULL;
-	StringInfoData		sql, temp_index;
+	StringInfoData		sql, sql_drop;
 	char				buffer[2][12];
 	char				*create_idx;
-	const char			*params[3];
+	const char			*schema_name, *table_name, *params[3];
+	Oid					table, index;
+	int					i, num, num_valid = -1;
 
-	params[0] = utoa(index, buffer[0]);
+	num = PQntuples(index_details);
+	table = getoid(index_details, 0, 3);
 	params[1] = utoa(table, buffer[1]);
 	params[2] = tablespace;
-	res = execute("SELECT repack.repack_indexdef($1, $2, $3, true)", 3, params);
-	if (PQntuples(res) < 1)
-	{
+	schema_name = getstr(index_details, 0, 5);
+	table_name = getstr(index_details, 0, 4);
+
+	/* Check if any concurrent pg_repack command is being run on the same
+	 * table.
+	 */
+	if (!advisory_lock(connection, params[1]))
 		ereport(ERROR, (errcode(EINVAL),
-						errmsg("unable to generate SQL to CREATE new index")));
-	}
-	create_idx = getstr(res, 0, 0);
-	CLEARPGRES(res);
-	res = execute_elevel(create_idx, 0, NULL, DEBUG2);
+			errmsg("Unable to obtain advisory lock on \"%s\"", table_name)));
 
-	initStringInfo(&temp_index);
-	if (schema_name)
-		appendStringInfo(&temp_index, "%s.index_%u", schema_name, index);
-	else
-		appendStringInfo(&temp_index, "index_%u", index);
-
-	if (PQresultStatus(res) != PGRES_COMMAND_OK)
+	for (i = 0; i < num; i++)
 	{
-		ereport(ERROR,
-			(errcode(E_PG_COMMAND),
-			errmsg("%s", PQerrorMessage(connection)),
-			errdetail("An invalid index may have been left behind "
-					  " by a pg_repack command on the table which"
-					  " was interrupted and failed to clean up"
-					  " the temporary objects. Please use \"DROP INDEX %s\""
-					  " to remove this index.", temp_index.data)));
+		char *isvalid = getstr(index_details, i, 2);
+
+		if (isvalid[0] == 't')
+		{
+			index = getoid(index_details, i, 1);
+			params[0] = utoa(index, buffer[0]);
+
+			res = execute("SELECT repack.repack_indexdef($1, $2, $3, true)", 3, params);
+			if (PQntuples(res) < 1)
+			{
+				elog(WARNING, 
+					"unable to generate SQL to CREATE work index for %s.%s",
+					schema_name, getstr(index_details, i, 0));
+				num_valid = i;
+				goto drop_idx;
+			}
+
+			create_idx = getstr(res, 0, 0);
+			CLEARPGRES(res);
+			res = execute_elevel(create_idx, 0, NULL, DEBUG2);
+
+			if (PQresultStatus(res) != PGRES_COMMAND_OK)
+			{
+				ereport(WARNING,
+					(errcode(E_PG_COMMAND),
+					errmsg("SQL failed with message- %s", 
+						PQerrorMessage(connection)),
+					errdetail("An invalid index may have been left behind"
+						" by a pg_repack command on the table which"
+						" was interrupted and failed to clean up"
+						" the temporary objects. Please use \"DROP INDEX %s.index_%u\""
+						" to remove this index and try again.", schema_name, index)));
+				num_valid = i + 1;
+				ret = false;
+				goto drop_idx;
+			}
+			CLEARPGRES(res);
+		}
+		else
+		{
+			if (num_valid == -1)
+				num_valid = i;
+			elog(WARNING, "skipping invalid index: %s.%s", schema_name, getstr(index_details, i, 0));
+		}
 	}
-	CLEARPGRES(res);
+
+	if (num_valid == -1)
+		num_valid = i;
 
 	/* take exclusive lock on table before calling repack_index_swap() */
 	initStringInfo(&sql);
-	if (schema_name)
-		appendStringInfo(&sql, "LOCK TABLE %s.%s IN ACCESS EXCLUSIVE MODE",
-						 schema_name, table_name);
-	else
-		appendStringInfo(&sql, "LOCK TABLE %s IN ACCESS EXCLUSIVE MODE",
-						 table_name);
+	appendStringInfo(&sql, "LOCK TABLE %s IN ACCESS EXCLUSIVE MODE",
+		table_name);
 	if (!(lock_exclusive(connection, params[1], sql.data, TRUE)))
 	{
-		elog(WARNING, "lock_exclusive() failed in connection for %s",
-			 table_name);
+		elog(WARNING, "lock_exclusive() failed in connection for %s", 
+			table_name);
 		goto drop_idx;
 	}
-	pgut_command(connection, "SELECT repack.repack_index_swap($1)", 1, params);
+	
+	for (i = 0; i < num_valid; i++)
+	{
+		index = getoid(index_details, i, 1);
+		params[0] = utoa(index, buffer[0]);
+		pgut_command(connection, "SELECT repack.repack_index_swap($1)", 1, params);
+	}
 	pgut_command(connection, "COMMIT", 0, NULL);
-
 	ret = true;
 
 drop_idx:
 	initStringInfo(&sql);
+	initStringInfo(&sql_drop);
 #if PG_VERSION_NUM < 90200
-	appendStringInfoString(&sql, "DROP INDEX ");
+	appendStringInfoString(&sql, "DROP INDEX IF EXISTS ");
 #else
-	appendStringInfoString(&sql, "DROP INDEX CONCURRENTLY ");
+	appendStringInfoString(&sql, "DROP INDEX CONCURRENTLY IF EXISTS ");
 #endif
-	appendStringInfo(&sql, "%s",  temp_index.data);
-	command(sql.data, 0, NULL);
+	appendStringInfo(&sql, "%s.",  schema_name);
 
-	CLEARPGRES(res);
+	for (i = 0; i < num_valid; i++)
+	{
+		initStringInfo(&sql_drop);
+		appendStringInfo(&sql_drop, "%sindex_%u", sql.data, getoid(index_details, i, 1));
+		command(sql_drop.data, 0, NULL);
+	}
+	termStringInfo(&sql_drop);
 	termStringInfo(&sql);
 	return ret;
 }
 
 /*
- * Call repack_one_index for each of the indexes
+ * Call repack_table_indexes for each of the table
  */
 static bool
 repack_all_indexes(char *errbuf, size_t errsize)
 {
-	bool				ret = false;
-	PGresult		   *res = NULL;
-	int					i;
-	int					num;
-	StringInfoData		sql;
-	char				buffer[12];
-	const char			*params[1];
-	const char			*table_name = NULL;
-	const char			*schema_name = NULL;
-	char				*pos;
+	bool					ret = false;
+	PGresult		   		*res = NULL;
+	StringInfoData			sql;
+	SimpleStringListCell	*cell = NULL;
+	const char				*params[1];
 
 	initStringInfo(&sql);
 	reconnect(ERROR);
 
+	assert(r_index.head || table_list.head);
+
 	if (!preliminary_checks(errbuf, errsize))
 		goto cleanup;
 
-	/* If only one index is specified, append the appropriate data to the sql
-	 * and check if the index exists
-	 */
-	if (r_index)
+	if (r_index.head)
 	{
-		appendStringInfoString(&sql, "SELECT i.relname, idx.indexrelid, idx.indisvalid, tbl.oid, tbl.relname"
-			" FROM pg_class tbl JOIN pg_index idx ON tbl.oid = idx.indrelid"
-			" JOIN pg_class i ON i.oid = idx.indexrelid"
-			" WHERE idx.indexrelid = $1::regclass");
-		params[0] = r_index;
-
-		res = execute_elevel(sql.data, 1, params, DEBUG2);
-
-		if (PQresultStatus(res) != PGRES_TUPLES_OK)
-		{
-			snprintf(errbuf, errsize, "%s", PQerrorMessage(connection));
-			goto cleanup;
-		}
-		else
-		{
-			num = PQntuples(res);
-			if (num == 0)
-			{
-				ereport(ERROR,
-					(errcode(EINVAL),
-				 	errmsg("index \"%s\" does not exist.\n", r_index)));
-			}
-		}
-
-		// separate schema name and index name. FIXME: kludge
-		pos = strchr(params[0], '.');
-		if (pos)
-		{
-			pos[0]  = '\0';
-			schema_name = params[0];
-			r_index = pos + 1;
-		}
-		table_name = getstr(res, 0, 4);
-	}
-	/* To repack all indexes, append appropriate data to the sql and run the query */
-	else {
-		params[0] = table_list.head->val;
-
-		appendStringInfoString(&sql, "SELECT i.relname, idx.indexrelid, idx.indisvalid, idx.indrelid"
+		appendStringInfoString(&sql, 
+			"SELECT i.relname, idx.indexrelid, idx.indisvalid, idx.indrelid, idx.indrelid::regclass, n.nspname"
 			" FROM pg_index idx JOIN pg_class i ON i.oid = idx.indexrelid"
-			" WHERE idx.indrelid = $1::regclass");
+			" JOIN pg_namespace n ON n.oid = i.relnamespace"
+			" WHERE idx.indexrelid = $1::regclass ORDER BY indisvalid DESC");
 
+		cell = r_index.head;
+	}
+	else if(table_list.head)
+	{
+		appendStringInfoString(&sql,
+			"SELECT i.relname, idx.indexrelid, idx.indisvalid, idx.indrelid, $1::text, n.nspname"
+			" FROM pg_index idx JOIN pg_class i ON i.oid = idx.indexrelid"
+			" JOIN pg_namespace n ON n.oid = i.relnamespace"
+			" WHERE idx.indrelid = $1::regclass ORDER BY indisvalid DESC");
+
+		cell = table_list.head;
+	}
+
+	for (; cell; cell = cell->next)
+	{
+		params[0] = cell->val;
 		res = execute_elevel(sql.data, 1, params, DEBUG2);
 
 		if (PQresultStatus(res) != PGRES_TUPLES_OK)
 		{
-			snprintf(errbuf, errsize, "%s", PQerrorMessage(connection));
-			goto cleanup;
+			elog(WARNING, "SQL failed with message- %s",
+				PQerrorMessage(connection));
+			continue;
 		}
-		else
+
+		if (PQntuples(res) == 0)
 		{
-			num = PQntuples(res);
-			if (num == 0)
-			{
+			if(table_list.head)
 				elog(WARNING, "\"%s\" does not have any indexes",
-					 table_list.head->val);
-				ret = true;
-				goto cleanup;
-			}
+					cell->val);
+			else if(r_index.head)
+				elog(WARNING, "\"%s\" is not a valid index",
+					cell->val);
+
+			continue;
 		}
 
-		// separate schema name and table name. FIXME: kludge
-		pos = strchr(params[0], '.');
-		if (pos)
-		{
-			pos[0]  = '\0';
-			schema_name = params[0];
-			table_name = pos + 1;
-		}
+		if(table_list.head)
+			elog(INFO, "repacking indexes of \"%s\"", cell->val);
 		else
-			table_name = params[0];
-	}
+			elog(INFO, "repacking \"%s\"", cell->val);
 
-	/* Check if any concurrent pg_repack command is being run on the same
-	 * table.
-	 */
-	if (!advisory_lock(connection, utoa(getoid(res, 0, 3), buffer))) {
-		snprintf(errbuf, errsize, "Unable to obtain advisory lock on \"%s\"",
-				 table_name);
-		goto cleanup;
-	}
-	for (i = 0; i < num; i++)
-	{
-		char *isvalid = getstr(res, i, 2);
-		if (isvalid[0] == 't')
-		{
-			if (schema_name)
-				elog(INFO, "repacking index \"%s.%s\"", schema_name, getstr(res, i, 0));
-			else
-				elog(INFO, "repacking index \"%s\"", getstr(res, i, 0));
-
-			if (!(repack_one_index(getoid(res, i, 3), table_name, getoid(res, i, 1), schema_name))) {
-				/* FIXME: fill in errbuf here */
-				goto cleanup;
-			}
-		}
-		else
-			if (schema_name)
-				elog(WARNING, "skipping invalid index: %s.%s", schema_name, getstr(res, i, 0));
-			else
-				elog(WARNING, "skipping invalid index: %s", getstr(res, i, 0));
+		if (!repack_table_indexes(res))	
+			elog(WARNING, "repack failed for \"%s\"", cell->val);
 	}
 	ret = true;