diff --git a/AUTHORS b/AUTHORS
index 59660cbb..8a983f86 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -238,3 +238,4 @@ that much better:
  * Gilb's Gilb's (https://github.com/gilbsgilbs)
  * Joshua Nedrud (https://github.com/Neurostack)
  * Shu Shen (https://github.com/shushen)
+ * xiaost7 (https://github.com/xiaost7)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index c2a0a527..8337c757 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -13,6 +13,7 @@ Changes in 0.10.7 - DEV
 - MapField now handles unicodes keys correctly. #1267
 - ListField now handles negative indicies correctly. #1270
 - Fixed AttributeError when initializing EmbeddedDocument with positional args. #681
+- Fixed no_cursor_timeout error with pymongo 3.0+ #1304
 
 Changes in 0.10.6
 =================