diff --git a/ChangeLog b/ChangeLog
index 0f45ae5932..66b79d950a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Dec 10 23:44:42 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_hash): add salt to differentiate false and empty
+	  array.  [ruby-core:58993] [Bug #9231]
+
+	* hash.c (rb_any_hash, rb_hash_hash): ditto.
+
 Tue Dec 10 18:16:09 2013  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
 
 	* man/ruby.1: [DOC] Use www.ruby-toolbox.com instead of RAA.
diff --git a/array.c b/array.c
index e6a45e86fd..b6d8a5584c 100644
--- a/array.c
+++ b/array.c
@@ -3792,6 +3792,7 @@ rb_ary_hash(VALUE ary)
     VALUE n;
 
     h = rb_hash_start(RARRAY_LEN(ary));
+    h = rb_hash_uint(h, (st_index_t)rb_ary_hash);
     for (i=0; i<RARRAY_LEN(ary); i++) {
 	n = rb_hash(RARRAY_AREF(ary, i));
 	h = rb_hash_uint(h, NUM2LONG(n));
diff --git a/hash.c b/hash.c
index a6944770a6..4273aec45a 100644
--- a/hash.c
+++ b/hash.c
@@ -118,7 +118,9 @@ rb_any_hash(VALUE a)
 
     if (SPECIAL_CONST_P(a)) {
 	if (a == Qundef) return 0;
-	hnum = rb_hash_end(rb_hash_start((st_index_t)a));
+	hnum = rb_hash_start((st_index_t)a);
+	hnum = rb_hash_uint(hnum, (st_index_t)rb_any_hash);
+	hnum = rb_hash_end(hnum);
     }
     else if (BUILTIN_TYPE(a) == T_STRING) {
 	hnum = rb_str_hash(a);
@@ -1972,10 +1974,12 @@ hash_i(VALUE key, VALUE val, VALUE arg)
 static VALUE
 rb_hash_hash(VALUE hash)
 {
-    st_index_t hval = RHASH_SIZE(hash);
-
-    if (!hval) return INT2FIX(0);
-    rb_hash_foreach(hash, hash_i, (VALUE)&hval);
+    st_index_t size = RHASH_SIZE(hash);
+    st_index_t hval = rb_hash_start(size);
+    hval = rb_hash_uint(hval, (st_index_t)rb_hash_hash);
+    if (size) {
+	rb_hash_foreach(hash, hash_i, (VALUE)&hval);
+    }
     hval = rb_hash_end(hval);
     return INT2FIX(hval);
 }
diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb
index 1f434e37fa..fb78085e61 100644
--- a/test/ruby/test_array.rb
+++ b/test/ruby/test_array.rb
@@ -909,6 +909,8 @@ class TestArray < Test::Unit::TestCase
     a3 = @cls[ 'dog', 'cat' ]
     assert_equal(a1.hash, a2.hash)
     assert_not_equal(a1.hash, a3.hash)
+    bug9231 = '[ruby-core:58993] [Bug #9231]'
+    assert_not_equal(false.hash, @cls[].hash, bug9231)
   end
 
   def test_include?
diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb
index afb0ca4805..8c8ce6d7c3 100644
--- a/test/ruby/test_hash.rb
+++ b/test/ruby/test_hash.rb
@@ -883,6 +883,8 @@ class TestHash < Test::Unit::TestCase
     h = @cls[1=>2]
     h.shift
     assert_equal({}.hash, h.hash, '[ruby-core:38650]')
+    bug9231 = '[ruby-core:58993] [Bug #9231]'
+    assert_not_equal(0, @cls[].hash, bug9231)
   end
 
   def test_update2