diff --git a/ChangeLog b/ChangeLog
index af4752e8c0..94084e1233 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Oct 13 11:04:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* debug.c (ruby_set_debug_option): define always for binary
+	  compatibility with debug env enabled binary.
+
+	* signal.c (ruby_enable_coredump): ditto.
+
 Wed Oct 13 10:52:51 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* include/ruby/ruby.h (ruby_executable_node): missing prototype.
diff --git a/debug.c b/debug.c
index 02fa9292a2..4959f922f6 100644
--- a/debug.c
+++ b/debug.c
@@ -136,7 +136,6 @@ ruby_debug_breakpoint(void)
     /* */
 }
 
-#ifdef RUBY_DEBUG_ENV
 static void
 set_debug_option(const char *str, int len, void *arg)
 {
@@ -161,4 +160,3 @@ ruby_set_debug_option(const char *str)
 {
     ruby_each_words(str, set_debug_option, 0);
 }
-#endif
diff --git a/debug.h b/debug.h
index cf904b6fcd..cc85a550f1 100644
--- a/debug.h
+++ b/debug.h
@@ -32,10 +32,7 @@ NODE *ruby_debug_print_node(int level, int debug_level, const char *header, cons
 int   ruby_debug_print_indent(int level, int debug_level, int indent_level);
 void  ruby_debug_breakpoint(void);
 void  ruby_debug_gc_check_func(void);
-
-#ifdef RUBY_DEBUG_ENV
 void ruby_set_debug_option(const char *str);
-#endif
 
 #if defined __GNUC__ && __GNUC__ >= 4
 #pragma GCC visibility pop
diff --git a/signal.c b/signal.c
index ba3595454a..4906e9162a 100644
--- a/signal.c
+++ b/signal.c
@@ -1041,8 +1041,9 @@ ruby_sig_finalize(void)
 }
 
 
-#ifdef RUBY_DEBUG_ENV
 int ruby_enable_coredump = 0;
+#ifndef RUBY_DEBUG_ENV
+#define ruby_enable_coredump 0
 #endif
 
 /*
@@ -1116,18 +1117,15 @@ Init_signal(void)
     install_sighandler(SIGUSR2, sighandler);
 #endif
 
-#ifdef RUBY_DEBUG_ENV
-    if (!ruby_enable_coredump)
-#endif
-    {
+    if (!ruby_enable_coredump) {
 #ifdef SIGBUS
-    install_sighandler(SIGBUS, sigbus);
+	install_sighandler(SIGBUS, sigbus);
 #endif
 #ifdef SIGSEGV
 # ifdef USE_SIGALTSTACK
-    rb_register_sigaltstack(GET_THREAD());
+	rb_register_sigaltstack(GET_THREAD());
 # endif
-    install_sighandler(SIGSEGV, (sighandler_t)sigsegv);
+	install_sighandler(SIGSEGV, (sighandler_t)sigsegv);
 #endif
     }
 #ifdef SIGPIPE