diff --git a/ChangeLog b/ChangeLog
index f4ce585997..307baa76c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
-Tue Dec 16 12:26:49 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Dec 16 12:30:56 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (ac_cv_header_ucontext_h): do not use ucontext.h on Mac
 	  OS X 10.5 or later.  merged from MacPorts.
 
+	* configure.in (ac_cv_func_daemon): daemon(3) is deprecated on Mac OS
+	  X 10.5 or later.
+
 Tue Dec 16 11:37:07 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ruby.c (set_arg0): use strlcpy() instead of strncpy().
diff --git a/configure.in b/configure.in
index fd38bfd364..1cc1deb487 100644
--- a/configure.in
+++ b/configure.in
@@ -523,6 +523,7 @@ darwin*)	LIBS="-lobjc $LIBS"
 		    ],
 		    [
 		    ac_cv_header_ucontext_h=no
+		    ac_cv_func_daemon=no
 		    ],
 		    [
 		    AC_DEFINE(BROKEN_SETREUID, 1)