diff --git a/ChangeLog b/ChangeLog
index 03cca4e592..7725fb911e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Nov  5 11:35:11 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (native_thread_init, native_thread_destroy):
+	  removed HAVE_PTHREAD_CONDATTR_INIT check because this silly
+	  #ifdef makes use-uninitialized-var issue and (2) native_cond_initialize()
+	  already have a right platform and caller don't need any additional care.
+	  [Bug #6825]
+
 Mon Nov  5 10:57:59 2012  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/cgi/core.rb: check if Tempfile is defined before use it.
diff --git a/thread_pthread.c b/thread_pthread.c
index 68ca08f18f..49686afbed 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -466,18 +466,14 @@ Init_native_thread(void)
 static void
 native_thread_init(rb_thread_t *th)
 {
-#ifdef HAVE_PTHREAD_CONDATTR_INIT
     native_cond_initialize(&th->native_thread_data.sleep_cond, RB_CONDATTR_CLOCK_MONOTONIC);
-#endif
     ruby_thread_set_native(th);
 }
 
 static void
 native_thread_destroy(rb_thread_t *th)
 {
-#ifdef HAVE_PTHREAD_CONDATTR_INIT
     native_cond_destroy(&th->native_thread_data.sleep_cond);
-#endif
 }
 
 #ifndef USE_THREAD_CACHE