diff --git a/history.txt b/history.txt
index 8a89f47..d05aca0 100644
--- a/history.txt
+++ b/history.txt
@@ -11,6 +11,7 @@
   * Bug fix: Remove double CGI escape when PUTting an attachment (nzoschke)
   * Bug fix: Changing Class proxy to set database on result sets (Peter Gumeson)
   * Bug fix: Updated time regexp (Nolan Darilek)
+  * Added an update_doc method to database to handle conflicts during atomic updates. (Pierre Larochelle)
 
 == 0.34