diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
new file mode 100644
index a62ffe6..a87b483
*** a/src/bin/psql/tab-complete.c
--- b/src/bin/psql/tab-complete.c
*************** psql_completion(const char *text, int st
*** 2994,2999 ****
--- 2994,3001 ----
  		COMPLETE_WITH_QUERY(Query_for_list_of_encodings);
  	else if (TailMatchesCS1("\\h") || TailMatchesCS1("\\help"))
  		COMPLETE_WITH_LIST(sql_commands);
+ 	else if (TailMatchesCS1("\\l*") && !TailMatchesCS1("\\lo_*"))
+ 		COMPLETE_WITH_QUERY(Query_for_list_of_databases);
  	else if (TailMatchesCS1("\\password"))
  		COMPLETE_WITH_QUERY(Query_for_list_of_roles);
  	else if (TailMatchesCS1("\\pset"))