diff --git a/ChangeLog b/ChangeLog
index f06afad953..cfb5bd4ca5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Dec 16 17:14:01 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* array.c (rb_ary_nitems, rb_ary_choice): Add a deprecation
+	  warning.
+
+	* hash.c (env_index, rb_hash_index): Simplify the deprecation
+	  warnings.
+
 Mon Dec 15 18:53:17 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/sync.rb (Sync_m#sync_try_lock): wrong variable name fixed.
diff --git a/array.c b/array.c
index d063b06bd6..14edc9bad9 100644
--- a/array.c
+++ b/array.c
@@ -3067,6 +3067,8 @@ rb_ary_nitems(ary)
     long n = 0;
     VALUE *p, *pend;
 
+    rb_warn("Array#nitems is deprecated; use Array#count { |i| !i.nil? }");
+
     for (p = RARRAY(ary)->ptr, pend = p + RARRAY(ary)->len; p < pend; p++) {
 	if (!NIL_P(*p)) n++;
     }
@@ -3363,6 +3365,8 @@ rb_ary_choice(ary)
 {
     long i, j;
 
+    rb_warn("Array#choice is deprecated; use Array#sample");
+
     i = RARRAY(ary)->len;
     if (i == 0) return Qnil;
     j = rb_genrand_real()*i;
diff --git a/hash.c b/hash.c
index f4297589d2..d7e0ab83fc 100644
--- a/hash.c
+++ b/hash.c
@@ -705,7 +705,7 @@ static VALUE
 rb_hash_index(hash, value)
     VALUE hash, value;
 {
-    rb_warning("Hash#index is deprecated and will be removed in 1.9; use Hash#key");
+    rb_warning("Hash#index is deprecated; use Hash#key");
     return rb_hash_key(hash, value);
 }
 
@@ -2484,7 +2484,7 @@ static VALUE
 env_index(dmy, value)
     VALUE dmy, value;
 {
-    rb_warning("ENV.index is deprecated and will be removed in 1.9; use ENV.key");
+    rb_warning("ENV.index is deprecated; use ENV.key");
     return env_key(dmy, value);
 }