diff --git a/ChangeLog b/ChangeLog
index fb794a6c41..2ebab00ca3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Aug 16 15:58:16 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* io.c (NOFILE): define NOFILE as 64 if not defined.
+
+	* signal.c (sighandler_t): rename to sh_t on dietlibc.
+
 Fri Aug 16 15:37:04 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* bignum.c (rb_cstr_to_inum): new decimal and octal string.
diff --git a/io.c b/io.c
index 62b2c36118..8edc5651b6 100644
--- a/io.c
+++ b/io.c
@@ -76,7 +76,9 @@ struct timeval {
 /* EMX has sys/param.h, but.. */
 #if defined(HAVE_SYS_PARAM_H) && !(defined(__EMX__) || defined(__HIUX_MPP__))
 # include <sys/param.h>
-#else
+#endif
+
+#if !defined NOFILE
 # define NOFILE 64
 #endif
 
diff --git a/signal.c b/signal.c
index faf0ba6833..6b2d50563f 100644
--- a/signal.c
+++ b/signal.c
@@ -288,6 +288,10 @@ rb_gc_mark_trap_list()
 #endif /* MACOS_UNUSE_SIGNAL */
 }
 
+#ifdef __dietlibc__
+#define sighandler_t sh_t
+#endif
+
 typedef RETSIGTYPE (*sighandler_t)_((int));
 
 #ifdef POSIX_SIGNAL