diff --git a/ChangeLog b/ChangeLog
index 3f22b12f04..1a512ad30c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 27 22:54:27 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/rubysocket.h (union_sockaddr): make it longer for SunOS
+	  and Darwin.
+
 Wed Feb 27 21:14:34 2013  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rexml/security.rb (REXML::Security): create.
diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h
index d06516f15a..10aa630602 100644
--- a/ext/socket/rubysocket.h
+++ b/ext/socket/rubysocket.h
@@ -161,6 +161,7 @@ typedef union {
   struct sockaddr_un un;
 #endif
   struct sockaddr_storage storage; 
+  char place_holder[2048]; /* sockaddr_storage is not enough for Unix domain sockets on SunOS and Darwin. */
 } union_sockaddr;
 
 #ifdef __APPLE__