diff --git a/ChangeLog b/ChangeLog
index 94424f3cfa..0a282b7870 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jun 28 10:18:42 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* process.c (rb_daemon): fix wrong #endif position.
+
 Tue Jun 28 07:50:32 2011  Eric Hodel  <drbrain@segment7.net>
 
 	* object.c (Init_Object):  Teach RDoc what Init_class_hierarchy does to
diff --git a/process.c b/process.c
index e873aedc23..19ab5744e1 100644
--- a/process.c
+++ b/process.c
@@ -4879,8 +4879,8 @@ rb_daemon(int nochdir, int noclose)
 	if (n > 2)
 	    (void)close (n);
     }
-    return err;
 #endif
+    return err;
 }
 #else
 #define proc_daemon rb_f_notimplement