diff --git a/ChangeLog b/ChangeLog
index 8ac2fac76d..d06cc33275 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Sep  3 21:35:19 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (sys/dyntune.h): for gettune().
+
+	* thread_pthread.c (hpux_attr_getstackaddr): fix missing *.
+	  [ruby-core:56983] [Feature #8793]
+
 Tue Sep  3 20:12:46 2013  Tanaka Akira  <akr@fsij.org>
 
 	* bignum.c (GMP_STR2BIG_DIGITS): New macro.
diff --git a/thread_pthread.c b/thread_pthread.c
index 9d1395910e..74d1ab7517 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -493,6 +493,8 @@ size_t pthread_get_stacksize_np(pthread_t);
 #elif defined HAVE_PTHREAD_GETTHRDS_NP
 #define STACKADDR_AVAILABLE 1
 #elif defined __ia64 && defined _HPUX_SOURCE
+#include <sys/dyntune.h>
+
 #define STACKADDR_AVAILABLE 1
 
 /*
@@ -519,7 +521,7 @@ size_t pthread_get_stacksize_np(pthread_t);
  * and could be retrieved by gettune().
  */
 static int
-hpux_attr_getstackaddr(const pthread_attr_t *attr, void *addr)
+hpux_attr_getstackaddr(const pthread_attr_t *attr, void **addr)
 {
     static uint64_t pagesize;
     size_t size;