diff --git a/CREDITS b/CREDITS
index 93866be5ff..65b9f4a284 100644
--- a/CREDITS
+++ b/CREDITS
@@ -798,3 +798,6 @@ N: Bernhard Urban-Forster
 C: Austria
 W: https://github.com/lewurm
 I: 2135
+
+N: Daniel Li
+I: 2150
diff --git a/HISTORY.rst b/HISTORY.rst
index 263bad0661..c9ea732006 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -14,6 +14,8 @@ XXXX-XX-XX
   undefined ``ethtool_cmd_speed`` symbol.
 - 2142_, [POSIX]: `net_if_stats()`_ 's ``flags`` on Python 2 returned unicode
   instead of str.  (patch by Matthieu Darbois)
+- 2150_, [Linux] `Process.threads()`_ may raise ``NoSuchProcess``. Fix race
+  condition.  (patch by Daniel Li)
 
 5.9.2
 =====