diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 62ab9a12d4f..ff0d3da0a80 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-01  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* emacsclient.c (socket_status): Use constant pointer.
+
 2011-05-28  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Use 'inline', not 'INLINE'.
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 2aabc52e828..c334fb6a196 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1098,7 +1098,7 @@ find_tty (const char **tty_type, const char **tty_name, int noabort)
    0 - success: none of the above */
 
 static int
-socket_status (char *name)
+socket_status (const char *name)
 {
   struct stat statbfr;