diff --git a/ChangeLog b/ChangeLog
index 0785d92963..40f67df545 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Aug  9 13:35:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* stable/ext/socket/socket.c (NI_MAXHOST, NI_MAXSERV): fixed invalid
+	  preprocessor directives.  a patch from Peter Bowen at
+	  [ruby-core:18211].
+
 Sat Aug  9 06:37:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* enc/make_encdb.rb, enc/trans/make_transdb.rb: skip nonexistent
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 7665ed43eb..19f9d2a38d 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -920,10 +920,10 @@ port_str(VALUE port, char *pbuf, size_t len)
 }
 
 #ifndef NI_MAXHOST
-# define 1025
+# define NI_MAXHOST 1025
 #endif
 #ifndef NI_MAXSERV
-# define 32
+# define NI_MAXSERV 32
 #endif
 
 static struct addrinfo*