diff --git a/ChangeLog b/ChangeLog
index bc0c739cd4..91eb86565f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
-Tue Apr 15 17:55:15 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Apr 15 18:02:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* include/ruby/intern.h (rb_argv): removed.  [ ruby-Bugs-19514 ]
+	* include/ruby/intern.h (rb_argv): replaced with rb_get_argv().
+	  [ruby-Bugs-19514]
 
 Tue Apr 15 17:10:59 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index b2b23f4a21..7e20439daf 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -480,7 +480,9 @@ int rb_reg_options(VALUE);
 void rb_set_kcode(const char*);
 const char* rb_get_kcode(void);
 /* ruby.c */
+#define rb_argv rb_get_argv()
 RUBY_EXTERN VALUE rb_argv0;
+VALUE rb_get_argv(void);
 void *rb_load_file(const char*);
 void ruby_script(const char*);
 void ruby_prog_init(void);
diff --git a/ruby.c b/ruby.c
index 4890d94b01..7676da1fc7 100644
--- a/ruby.c
+++ b/ruby.c
@@ -66,9 +66,6 @@ VALUE rb_parser_set_yydebug(VALUE, VALUE);
 const char *ruby_get_inplace_mode(void);
 void ruby_set_inplace_mode(const char *);
 
-extern VALUE rb_get_argv(void);
-#define rb_argv rb_get_argv()
-
 #define DISABLE_BIT(bit) (1U << disable_##bit)
 enum disable_flag_bits {
     disable_gems,