diff --git a/debian/changelog b/debian/changelog
index ec3de63d..382c8184 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+notmuch (0.31.4-2) unstable; urgency=medium
+
+  * Cherry pick upstream commit 3f4de98e7c8, which fixes a bug where
+    duplicate message-ids can cause multiple thread-ids for some message
+    documents.
+
+ -- David Bremner <bremner@debian.org>  Sat, 26 Jun 2021 22:44:08 -0300
+
 notmuch (0.31.4-1) unstable; urgency=medium
 
   * New upstream bugfix release