diff --git a/ChangeLog b/ChangeLog
index c0f2b1289d..2455a13c22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 24 21:14:29 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, io.c: use sys/syscall.h if syscall.h is not available.
+	  [ruby-core:06247]
+
 Mon Oct 24 20:38:25 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/Win32API/lib/win32/resolv.rb (get_info): support multiple DNS.
@@ -5,7 +10,7 @@ Mon Oct 24 20:38:25 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 Mon Oct 24 11:01:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk/canvas.rb (TkCanvasItemConfig::__item_val2ruby_optkeys): 
+	* ext/tk/lib/tk/canvas.rb (TkCanvasItemConfig::__item_val2ruby_optkeys):
 	  typo fixed.  [ruby-talk:162187]
 
 	* ext/tk/lib/tk/menu.rb (TkMenuEntryConfig::__item_val2ruby_optkeys):
@@ -15,12 +20,12 @@ Sun Oct 23 07:11:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/extconf.rb: improbe messages [ruby-core:06325].
 
-	* ext/tk/lib/tk.rb, ext/tk/lib/tk/canvas.rb, ext/tk/lib/tk/entry.rb, 
-	  ext/tk/lib/tk/frame.rb, ext/tk/lib/tk/image.rb, 
-	  ext/tk/lib/tk/itemconfig.rb, ext/tk/lib/tk/labelframe.rb, 
-	  ext/tk/lib/tk/listbox.rb, ext/tk/lib/tk/menu.rb, 
-	  ext/tk/lib/tk/radiobutton.rb, ext/tk/lib/tk/scale.rb, 
-	  ext/tk/lib/tk/spinbox.rb, ext/tk/lib/tk/text.rb, 
+	* ext/tk/lib/tk.rb, ext/tk/lib/tk/canvas.rb, ext/tk/lib/tk/entry.rb,
+	  ext/tk/lib/tk/frame.rb, ext/tk/lib/tk/image.rb,
+	  ext/tk/lib/tk/itemconfig.rb, ext/tk/lib/tk/labelframe.rb,
+	  ext/tk/lib/tk/listbox.rb, ext/tk/lib/tk/menu.rb,
+	  ext/tk/lib/tk/radiobutton.rb, ext/tk/lib/tk/scale.rb,
+	  ext/tk/lib/tk/spinbox.rb, ext/tk/lib/tk/text.rb,
 	  ext/tk/lib/tk/toplevel.rb: improve conversion of option values.
 
 	* ext/tk/lib/tkextlib/*: ditto.
diff --git a/configure.in b/configure.in
index 6b4e12e1ec..6518b49e14 100644
--- a/configure.in
+++ b/configure.in
@@ -436,7 +436,7 @@ dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h\
+AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h sys/syscall.h\
 		 fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\
 		 syscall.h pwd.h grp.h a.out.h utime.h memory.h direct.h sys/resource.h \
 		 sys/mkdev.h sys/utime.h netinet/in_systm.h float.h ieeefp.h pthread.h \
diff --git a/io.c b/io.c
index 5c7fc39c98..addebc3607 100644
--- a/io.c
+++ b/io.c
@@ -74,6 +74,8 @@
 
 #ifdef HAVE_SYSCALL_H
 #include <syscall.h>
+#elif defined HAVE_SYS_SYSCALL_H
+#include <sys/syscall.h>
 #endif
 
 extern void Init_File(void);