diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 4dbeda993ee8d34117dd6484b2381df2cf2740d1..373c257f539dcdc10d32df42101adf1428604878 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.177 2005/01/08 22:13:28 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.178 2005/01/14 00:23:21 momjian Exp $
 -->
 
  <chapter id="libpq">
@@ -3883,7 +3883,7 @@ The file <filename>.pgpass</filename> in a user's home directory is a file
 that can contain passwords to be used if the connection requires a
 password (and no password has been specified otherwise).
 On Microsoft Windows the file is named
-<filename>%APPDATA%\postgresql\pgpass.txt</> (where <filename>%APPDATA%</>
+<filename>%APPDATA%\postgresql\pgpass.conf</> (where <filename>%APPDATA%</>
 refers to the Application Data subdirectory in the user's profile).
 </para>
 
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 7f7a4173fe5a2237844b8671cfd66f3d0f80dc19..b5bf703a711c95006fe5f9ddc7fc523049136fd1 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.129 2005/01/06 21:20:44 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.130 2005/01/14 00:24:23 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -2525,7 +2525,7 @@ $endif
      <filename>psqlrc</filename> file and the user's
      <filename>~/.psqlrc</filename> file.
      (On Windows, the user's startup file is named
-     <filename>%APPDATA%\postgresql\psqlrc.txt</filename>.)
+     <filename>%APPDATA%\postgresql\psqlrc.conf</filename>.)
      See <filename><replaceable>PREFIX</>/share/psqlrc.sample</>
      for information on setting up the system-wide file.  It could be used
      to set up the client or the server to taste (using the <command>\set
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index b8f6ca5f56226ee8fd75a0e333f01248395320a0..6945cc29d6e875fb67f2f0c98eea64f6800a6313 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.109 2005/01/06 18:29:09 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.110 2005/01/14 00:25:17 momjian Exp $
  */
 #include "postgres_fe.h"
 
@@ -48,7 +48,7 @@ PsqlSettings pset;
 #define PSQLRC		".psqlrc"
 #else
 #define SYSPSQLRC	"psqlrc"
-#define PSQLRC		"psqlrc.txt"
+#define PSQLRC		"psqlrc.conf"
 #endif
 
 /*
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 020d4c7ec999aee297c51231993035ad1526a5e4..52f0fe32ac658119fa5c2fe611fa268a08521df9 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.300 2005/01/10 00:19:43 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.301 2005/01/14 00:25:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -69,7 +69,7 @@
 #ifndef WIN32
 #define PGPASSFILE ".pgpass"
 #else
-#define PGPASSFILE "pgpass.txt"
+#define PGPASSFILE "pgpass.conf"
 #endif
 
 /* fall back options if they are not specified by arguments or defined