Index: django/db/backends/postgresql/creation.py
===================================================================
--- django/db/backends/postgresql/creation.py	(revision 11784)
+++ django/db/backends/postgresql/creation.py	(working copy)
@@ -34,3 +34,42 @@
         if settings.TEST_DATABASE_CHARSET:
             return "WITH ENCODING '%s'" % settings.TEST_DATABASE_CHARSET
         return ''
+
+    def sql_indexes_for_field(self, model, f, style):
+        from django.db.models.fields import CharField, TextField
+
+        if f.db_index and not f.unique:
+            qn = self.connection.ops.quote_name
+            tablespace = f.db_tablespace or model._meta.db_tablespace
+            if tablespace:
+                sql = self.connection.ops.tablespace_sql(tablespace)
+                if sql:
+                    tablespace_sql = ' ' + sql
+                else:
+                    tablespace_sql = ''
+            else:
+                tablespace_sql = ''
+
+            def get_index_sql(index_name, db_table, column, opclass=''):
+                return (style.SQL_KEYWORD('CREATE INDEX') + ' ' +
+                        style.SQL_TABLE(index_name) + ' ' +
+                        style.SQL_KEYWORD('ON') + ' ' +
+                        style.SQL_TABLE(db_table) + ' ' +
+                        "(%s%s)" % (style.SQL_FIELD(column), opclass) +
+                        "%s;" % tablespace_sql)
+
+            db_table = model._meta.db_table
+            output = [get_index_sql(qn('%s_%s' % (db_table, f.column)),
+                                    qn(db_table), qn(f.column))]
+
+            if isinstance(f, CharField):
+                output.append(get_index_sql(qn('%s_%s_like' % (db_table, f.column)),
+                                            qn(db_table), qn(f.column),
+                                            ' varchar_pattern_ops'))
+            elif isinstance(f, TextField):
+                output.append(get_index_sql(qn('%s_%s_like' % (db_table, f.column)),
+                                            qn(db_table), qn(f.column),
+                                            ' text_pattern_ops'))                
+        else:
+            output = []
+        return output