diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index c571c9a81fdfb615b6153cfc0ba5d1ac6cec4de4..6ca8f820e34f57ffaa0a6348f75760c76ef14e98 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.153 2002/11/15 01:40:15 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.154 2002/11/15 01:57:25 momjian Exp $
 -->
 
 <Chapter Id="runtime">
@@ -995,7 +995,7 @@ env PGOPTIONS='-c geqo=off' psql
      </varlistentry>
 
      <varlistentry>
-      <term><varname>HOSTNAME_LOOKUP</varname> (<type>boolean</type>)</term>
+      <term><varname>LOG_HOSTNAME</varname> (<type>boolean</type>)</term>
       <listitem>
        <para>
         By default, connection logs only show the IP address of the
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index c8c0642fc21b3e4a8be16190205746d2ed042cdc..a9d18a575b8e6ef056f14fcb6d5e72fd5ecfe4b7 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.295 2002/11/15 01:40:18 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.296 2002/11/15 01:57:26 momjian Exp $
  *
  * NOTES
  *
@@ -199,7 +199,7 @@ int			PreAuthDelay = 0;
 int			AuthenticationTimeout = 60;
 int			CheckPointTimeout = 300;
 
-bool		HostnameLookup;		/* for ps display */
+bool		log_hostname;		/* for ps display */
 bool		LogSourcePort;
 bool		Log_connections = false;
 bool		Db_user_namespace = false;
@@ -2097,7 +2097,7 @@ DoBackend(Port *port)
 
 		remote_host = NULL;
 
-		if (HostnameLookup)
+		if (log_hostname)
 		{
 			struct hostent *host_ent;
 
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index cfd632c3311bd9dd32797fd9ddca467c4a18c91d..96d42109e0605a83b166eeac1f9b53e72b52eeba 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -5,7 +5,7 @@
  * command, configuration file, and command line options.
  * See src/backend/utils/misc/README for more information.
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.104 2002/11/15 01:40:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.105 2002/11/15 01:57:27 momjian Exp $
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  * Written by Peter Eisentraut <peter_e@gmx.net>.
@@ -476,7 +476,7 @@ static struct config_bool
 #endif
 
 	{
-		{"hostname_lookup", PGC_SIGHUP}, &HostnameLookup,
+		{"log_hostname", PGC_SIGHUP}, &log_hostname,
 		false, NULL, NULL
 	},
 	{
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 9b4fb28c83b889dd7f6fabe14d3d5811544b4d1b..becc6dfbe745466d27ca7575e1b72d75890c90ad 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -34,7 +34,6 @@
 #superuser_reserved_connections = 2
 
 #port = 5432 
-#hostname_lookup = false
 
 #unix_socket_directory = ''
 #unix_socket_group = ''
@@ -121,6 +120,7 @@
 #silent_mode = false
 
 #log_connections = false
+#log_hostname = false
 #log_source_port = false
 #log_pid = false
 #log_statement = false
diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h
index c02b65c55ceecf2d1c6b794961fbfbbd17c5f590..3ac7dac96a9a1880788dca4bd9245ee909d8658e 100644
--- a/src/include/tcop/tcopprot.h
+++ b/src/include/tcop/tcopprot.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tcopprot.h,v 1.52 2002/11/15 01:40:20 momjian Exp $
+ * $Id: tcopprot.h,v 1.53 2002/11/15 01:57:28 momjian Exp $
  *
  * OLD COMMENTS
  *	  This file was created so that other c files could get the two
@@ -30,7 +30,7 @@ extern DLLIMPORT sigjmp_buf Warn_restart;
 extern bool Warn_restart_ready;
 extern bool InError;
 extern CommandDest whereToSendOutput;
-extern bool HostnameLookup;
+extern bool log_hostname;
 extern bool LogSourcePort;
 extern DLLIMPORT char* debug_query_string;