diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index e7fd3df45f95b1366f1473c4da3078ad4e7db97d..93c5b39a20d8f4da499cde0136e07281e42dda23 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000-2002 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.56 2002/08/10 03:56:24 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.57 2002/08/15 02:49:04 momjian Exp $
  */
 
 /*----------------------------------------------------------------------
@@ -358,6 +358,14 @@ psql_completion(char *text, int start, int end)
 			 && strcasecmp(prev_wd, "USER") == 0)
 		COMPLETE_WITH_QUERY(Query_for_list_of_users);
 
+/* ANALYZE */
+	/* If the previous word is ANALYZE, produce list of tables. */
+	else if (strcasecmp(prev_wd, "ANALYZE") == 0)
+		COMPLETE_WITH_QUERY(Query_for_list_of_tables);
+	/* If we have ANALYZE <table>, complete with semicolon. */
+	else if (strcasecmp(prev2_wd, "ANALYZE") == 0)
+		COMPLETE_WITH_CONST(";");
+
 /* CLUSTER */
 	/* If the previous word is CLUSTER, produce list of indexes. */
 	else if (strcasecmp(prev_wd, "CLUSTER") == 0)