diff --git a/ChangeLog b/ChangeLog
index 71e0e6b38e..a3aef2ecae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jul 23 22:59:49 2006  Tanaka Akira  <akr@fsij.org>
+
+	* test/socket/test_unix.rb: disabled on cygwin.
+	  reported by Kouhei Yanagita.  [ruby-dev:29080]
+
 Fri Jul 21 23:57:26 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ruby.c (proc_options): script is never used while recursing.
diff --git a/test/socket/test_unix.rb b/test/socket/test_unix.rb
index 87660cbef3..14ddd6a4b6 100644
--- a/test/socket/test_unix.rb
+++ b/test/socket/test_unix.rb
@@ -138,4 +138,4 @@ class TestUNIXSocket < Test::Unit::TestCase
     s2.close if s2
   end
 
-end if defined?(UNIXSocket)
+end if defined?(UNIXSocket) && /cygwin/ !~ RUBY_PLATFORM