diff --git a/ChangeLog b/ChangeLog
index 3562ff8ea6..8ec8b9221b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Apr 14 10:57:40  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* defines.h: include <net/socket.h> to get fd_set definition in BeOS.
+
 Tue Apr 13 23:00:55 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/rinda/rinda.rb: change pattern matching. 
diff --git a/defines.h b/defines.h
index 1cc9a6a9af..abfd53cc1c 100644
--- a/defines.h
+++ b/defines.h
@@ -188,6 +188,10 @@ typedef int pid_t;
 #include "vms/vms.h"
 #endif
 
+#if defined(__BEOS__)
+#include <net/socket.h> /* intern.h needs fd_set definition */
+#endif
+
 #undef RUBY_EXTERN
 #if defined _WIN32 && !defined __GNUC__
 # ifndef RUBY_EXPORT
@@ -228,7 +232,7 @@ flush_register_windows(void)
 #  define FLUSH_REGISTER_WINDOWS flush_register_windows()
 #else
 #  define FLUSH_REGISTER_WINDOWS ((void)0)
-#endif 
+#endif
 
 #if defined(DOSISH)
 #define PATH_SEP ";"