diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 13d74fd39af..111fb5e22b0 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1184,6 +1184,9 @@ Release 2.7.0 - UNRELEASED
     HADOOP-11754. RM fails to start in non-secure mode due to authentication
     filter failure. (wheat9)
 
+    HADOOP-11787. OpensslSecureRandom.c pthread_threadid_np usage signature is
+    wrong on 32-bit Mac. (Kiran Kumar M R via cnauroth)
+
 Release 2.6.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c
index 8f0c06d17a1..26e1fa623e8 100644
--- a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c
+++ b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c
@@ -286,7 +286,9 @@ static unsigned long pthreads_thread_id(void)
 #elif defined(__sun)
   thread_id = (unsigned long)pthread_self();
 #elif defined(__APPLE__)
-  (void)pthread_threadid_np(pthread_self(), &thread_id);
+  __uint64_t tmp_thread_id;
+  (void)pthread_threadid_np(pthread_self(), &tmp_thread_id);
+  thread_id = (unsigned long)tmp_thread_id;
 #else
 #error "Platform not supported"
 #endif