Index: System.Data.SQLite/SQLiteConnection.cs
==================================================================
--- System.Data.SQLite/SQLiteConnection.cs
+++ System.Data.SQLite/SQLiteConnection.cs
@@ -1170,11 +1170,16 @@
                   row["INDEX_CATALOG"] = strCatalog;
                   row["PRIMARY_KEY"] = true;
                   row["INDEX_NAME"] = String.Format(CultureInfo.InvariantCulture, "sqlite_master_PK_{0}", rdTables.GetString(2));
                   row["UNIQUE"] = true;
 
-                  tbl.Rows.Add(row);
+                  if (String.Compare((string)row["INDEX_NAME"], strIndex, true, CultureInfo.InvariantCulture) == 0
+                  || strIndex == null)
+                  {
+                    tbl.Rows.Add(row);
+                  }
+
                   primaryKeys.Clear();
                 }
               }
 
               // Now fetch all the rest of the indexes.
@@ -1506,11 +1511,12 @@
                   row["TABLE_NAME"] = rdTables.GetString(2);
                   row["COLUMN_NAME"] = primaryKeys[0].Value;
                   row["INDEX_NAME"] = row["CONSTRAINT_NAME"];
                   row["ORDINAL_POSITION"] = primaryKeys[0].Key;
 
-                  tbl.Rows.Add(row);
+                  if (String.IsNullOrEmpty(strIndex) || String.Compare(strIndex, (string)row["INDEX_NAME"], true, CultureInfo.InvariantCulture) == 0)
+                    tbl.Rows.Add(row);
                 }
               }
 
               using (SQLiteCommand cmdIndexes = new SQLiteCommand(String.Format(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[sqlite_master] WHERE [type] LIKE 'index' AND [tbl_name] LIKE '{1}'", strCatalog, rdTables.GetString(2).Replace("'", "''")), this))
               {