diff --git a/ChangeLog b/ChangeLog
index 3193874b18..ac33ac8fcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jul 22 20:12:56 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread_pthread.c (get_stack): fix memory leak; pthread_attr_destory
+	  must be called even when pthread_getattr_np is used.
+	  [ruby-core:31269]
+
 Thu Jul 22 16:27:41 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* re.c (rb_reg_expr_str): fix broken Regexp#inspect when it
diff --git a/thread_pthread.c b/thread_pthread.c
index e974b73e6f..e832b82fe1 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -226,9 +226,7 @@ get_stack(void **addr, size_t *size)
 # endif
     CHECK_ERR(pthread_attr_getguardsize(&attr, &guard));
     *size -= guard;
-# ifndef HAVE_PTHREAD_GETATTR_NP
     pthread_attr_destroy(&attr);
-# endif
 #elif defined HAVE_PTHREAD_GET_STACKADDR_NP && defined HAVE_PTHREAD_GET_STACKSIZE_NP
     pthread_t th = pthread_self();
     *addr = pthread_get_stackaddr_np(th);