diff --git a/ChangeLog b/ChangeLog
index cf124a3a86..d0f44fea03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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/>.
+
 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 2e23050867..24fde6eb27 100644
--- a/st.c
+++ b/st.c
@@ -2,12 +2,12 @@
 
 /* static	char	sccsid[] = "@(#) st.c 5.1 89/12/14 Crucible"; */
 
-#include "config.h"
 #include <stdio.h>
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 #include <string.h>
+#include "defines.h"
 
 #ifdef NOT_RUBY
 #include "regint.h"
@@ -53,6 +53,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((size_t)sizeof(type))
 #define Calloc(n,s) (char*)calloc((n),(s))