2 files changed, 8 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 94ae1496921..8b29c804943 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-25  Juanma Barranquero  <lekktu@gmail.com>
+
+        * process.c (Fmake_network_process): When arg :host is 'local,
+        use address 127.0.0.1, not name "localhost".  (Bug#6781)
+
 2010-09-24  Eli Zaretskii  <eliz@gnu.org>
 
         * indent.c (Fcurrent_indentation, indented_beyond_p)
diff --git a/src/process.c b/src/process.c
index ec1b9586db5..ac82f12debb 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3170,7 +3170,9 @@ usage: (make-network-process &rest ARGS)  */)
   if (!NILP (host))
     {
       if (EQ (host, Qlocal))
-        host = build_string ("localhost");
+        /* Depending on setup, "localhost" may map to different IPv4 and/or
+           IPv6 addresses, so it's better to be explicit.  (Bug#6781) */
+        host = build_string ("127.0.0.1");
       CHECK_STRING (host);
     }