diff --git a/ChangeLog b/ChangeLog
index 872fb12247..034b835f45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Feb 22 20:09:29 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (inspect_linger): message refined.
+
 Sun Feb 22 19:28:08 2009  Tanaka Akira  <akr@fsij.org>
 
 	* ext/socket/init.c (s_recvfrom): use rb_io_wait_readable after
diff --git a/ext/socket/option.c b/ext/socket/option.c
index a188061418..5563a7d8bb 100644
--- a/ext/socket/option.c
+++ b/ext/socket/option.c
@@ -272,7 +272,7 @@ inspect_linger(int level, int optname, VALUE data, VALUE ret)
     if (RSTRING_LEN(data) == sizeof(struct linger)) {
         struct linger s;
         memcpy((char*)&s, RSTRING_PTR(data), sizeof(s));
-        rb_str_catf(ret, " onoff:%d linger:%d", s.l_onoff, s.l_linger);
+        rb_str_catf(ret, " %s %dsec", s.l_onoff ? "on" : "off", s.l_linger);
         return 1;
     }
     else {