diff --git a/ChangeLog b/ChangeLog
index 77d14775f0..0feb6c94d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,14 @@ Sat Jul 15 01:27:13 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* dir.c (has_magic): glob names contain alphabets to enable case fold
 	  search also for directories.  fixed: [ruby-talk:201917]
 
+Sat Jul 15 01:09:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* st.c (malloc): use xmalloc/xcalloc instead of plain
+	  malloc/calloc, to detect memory allocation failure.  see
+	  <http://www.nongnu.org/failmalloc/>.
+
+	* gc.c (rb_memerror): should not raise nomem_error.
+
 Fri Jul 14 13:08:13 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: add methods for new features of latest Tcl/Tk8.5.
diff --git a/st.c b/st.c
index c6f0c2faf3..ced1f9196a 100644
--- a/st.c
+++ b/st.c
@@ -48,6 +48,11 @@ static struct st_hash_type type_strhash = {
 
 static void rehash(st_table *);
 
+#ifdef RUBY
+#define malloc xmalloc
+#define calloc xcalloc
+#endif
+
 #define alloc(type) (type*)malloc((unsigned)sizeof(type))
 #define Calloc(n,s) (char*)calloc((n),(s))