diff --git a/ChangeLog b/ChangeLog
index b01fadda5e..162ecec853 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
-Thu Jul 26 13:37:47 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jul 26 13:57:45 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln.c (load_1, dln_find_1): constified.
 
 	* dln.c (conv_to_posix_path): removed.
 
+	* ruby.c (usage): constified.
+
 	* ruby.c (rubylib_mangled_path, rubylib_mangled_path2): return
 	  VALUE instead of a pointer to static buffer.
 
diff --git a/dln.c b/dln.c
index deae9ac2c4..8b46954002 100644
--- a/dln.c
+++ b/dln.c
@@ -612,7 +612,7 @@ reloc_repl(int no, struct undef *undef, struct indr_data *data)
 static int
 load_1(int fd, long disp, const char *need_init)
 {
-    static char *libc = LIBC_NAME;
+    static const char *libc = LIBC_NAME;
     struct exec hdr;
     struct relocation_info *reloc = NULL;
     long block = 0;
@@ -1714,7 +1714,7 @@ dln_find_1(const char *fname, const char *path, int exe_flag /* non 0 if looking
 #endif
 #if defined(DOSISH)
 	if (exe_flag) {
-	    static const char *extension[] = {
+	    static const char *const extension[] = {
 #if defined(MSDOS)
 		".com", ".exe", ".bat",
 #if defined(DJGPP)
diff --git a/ruby.c b/ruby.c
index 279fe4d0b6..7fb36355fa 100644
--- a/ruby.c
+++ b/ruby.c
@@ -80,7 +80,7 @@ usage(const char *name)
     /* This message really ought to be max 23 lines.
      * Removed -h because the user already knows that option. Others? */
 
-    static const char *usage_msg[] = {
+    static const char *const usage_msg[] = {
 	"-0[octal]       specify record separator (\\0, if no argument)",
 	"-a              autosplit mode with -n or -p (splits $_ into $F)",
 	"-c              check syntax only",
@@ -106,7 +106,7 @@ usage(const char *name)
 	"--version       print the version",
 	NULL
     };
-    const char **p = usage_msg;
+    const char *const *p = usage_msg;
 
     printf("Usage: %s [switches] [--] [programfile] [arguments]\n", name);
     while (*p)