diff --git a/ChangeLog b/ChangeLog
index 917f5534a2..f9b8bdacb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 18 13:54:36 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_cleanup): return EXIT_FAILURE if any exceptions occured
+	  in at_exit blocks.  [ruby-core:11263]
+
 Mon Jun 18 02:49:16 2007  Koichi Sasada  <ko1@atdot.net>
 
 	* vm.c (env_mark): fix to mark block.proc.
diff --git a/eval.c b/eval.c
index 52ad4295c8..692d967fa8 100644
--- a/eval.c
+++ b/eval.c
@@ -191,8 +191,22 @@ ruby_cleanup(int ex)
 	    VALUE sig = rb_iv_get(err, "signo");
 	    ruby_default_signal(NUM2INT(sig));
 	}
+	else if (ex == 0) {
+	    ex = 1;
+	}
     }
 
+#if EXIT_SUCCESS != 0 || EXIT_FAILURE != 1
+    switch (ex) {
+#if EXIT_SUCCESS != 0
+      case 0: return EXIT_SUCCESS;
+#endif
+#if EXIT_FAILURE != 1
+      case 1: return EXIT_FAILURE;
+#endif
+    }
+#endif
+
     return ex;
 }