diff --git a/ChangeLog b/ChangeLog
index beb5b0cf93..8c1e98347e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jan  8 11:54:43 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (aligned_free): support MinGW. Patch by Hiroshi Shirosaki.
+
 Sun Jan  8 11:43:05 2012  Narihiro Nakamura  <authornari@gmail.com>
 
 	* gc.c (slot_sweep): add a assertion instead of a debug print.
diff --git a/gc.c b/gc.c
index c2a1a7c6fd..b5c0094868 100644
--- a/gc.c
+++ b/gc.c
@@ -1081,7 +1081,9 @@ aligned_malloc(size_t aligned_size)
 static void
 aligned_free(void *ptr)
 {
-#if _WIN32 || defined __CYGWIN__
+#if __MINGW32__
+    __mingw_aligned_free(ptr);
+#elif _WIN32 || defined __CYGWIN__
     _aligned_free(ptr);
 #else
     free(ptr);