diff --git a/ChangeLog b/ChangeLog
index 3051dce859..2e5e89cbba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Dec 22 05:09:43 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y (parser_str_new, rb_intern3): rb_default_encoding() renamed.
+
+	* ext/nkf/nkf.c (rb_nkf_putchar): ditto.
+
 Sat Dec 22 03:54:18 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* encoding.c (rb_ascii_encoding): renamed from previous
diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c
index 0ae4689bde..9877901478 100644
--- a/ext/nkf/nkf.c
+++ b/ext/nkf/nkf.c
@@ -64,7 +64,7 @@ rb_nkf_putchar(unsigned int c)
 rb_encoding* rb_nkf_enc_get(const char *name)
 {
     int idx = rb_enc_find_index(name);
-    if (idx < 0) idx = rb_enc_replicate(name, rb_default_encoding());
+    if (idx < 0) idx = rb_enc_replicate(name, rb_ascii_encoding());
     return rb_enc_from_index(idx);
 }
 
diff --git a/parse.y b/parse.y
index 08a25df257..9cb3e18e83 100644
--- a/parse.y
+++ b/parse.y
@@ -4844,7 +4844,7 @@ parser_str_new(const char *p, long n, rb_encoding *enc, int func)
     if (!(func & STR_FUNC_REGEXP) &&
         rb_enc_asciicompat(enc) &&
         rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT) {
-        rb_enc_associate(str, rb_default_encoding());
+        rb_enc_associate(str, rb_ascii_encoding());
     }
 
     return str;
@@ -8969,7 +8969,7 @@ rb_intern3(const char *name, long len, rb_encoding *enc)
 	}
     }
     if (m - name < len) id = ID_JUNK;
-    if (enc != rb_default_encoding()) {
+    if (enc != rb_ascii_encoding()) {
 	/*
 	 * this clause makes sense only when called from other than
 	 * rb_intern_str() taking care of code-range.
@@ -8978,7 +8978,7 @@ rb_intern3(const char *name, long len, rb_encoding *enc)
 	    for (; m <= name + len; ++m) {
 		if (!ISASCII(*m)) goto mbstr;
 	    }
-	    enc = rb_default_encoding();
+	    enc = rb_ascii_encoding();
 	}
       mbstr:;
     }