diff --git a/ChangeLog b/ChangeLog
index 92a8135853..cf68408a9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,11 @@
-Tue Jul  7 16:54:24 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jul  7 17:00:38 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (rb_gc_call_finalizer_at_exit): deal with typed struct like
+	  as obj_free().
 
 	* error.c (rb_typed_struct_is_kind_of): new function to see if the
 	  given typed struct.
 
-Tue Jul  7 13:44:49 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
 	* error.c (rb_check_typed_struct): new function to check typed
 	  struct.
 
diff --git a/gc.c b/gc.c
index b49e221df9..11bcd3b348 100644
--- a/gc.c
+++ b/gc.c
@@ -2802,6 +2802,9 @@ rb_gc_call_finalizer_at_exit(void)
 		DATA_PTR(p) && RANY(p)->as.data.dfree &&
 		RANY(p)->as.basic.klass != rb_cThread && RANY(p)->as.basic.klass != rb_cMutex) {
 		p->as.free.flags = 0;
+		if (RTYPEDDATA_P(p)) {
+		    RDATA(p)->dfree = RANY(p)->as.typeddata.type->dfree;
+		}
 		if ((long)RANY(p)->as.data.dfree == -1) {
 		    xfree(DATA_PTR(p));
 		}