diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84b811de..441030b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [3.7.1] - 2022-08-09
+
+### Fixed
+
+- Use a cross-process mutex (on Windows) to avoid crashes trying to update the Notes file
+- Updated to the latest Mercurial package so users no longer rely on python-is-python2
+
 ## [3.6.3] - 2022-07-29
 
 ### Fixed
diff --git a/debian/changelog b/debian/changelog
index cc8275ee..8368f3c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+flexbridge (3.7.1) UNRELEASED; urgency=low
+
+  * Fixed
+
+    * Use a cross-process mutex (on Windows) to avoid crashes trying to update the Notes file
+    * Updated to the latest Mercurial package so users no longer rely on python-is-python2
+
+ -- Jason Naylor <jason_naylor@sil.org>  Tue, 09 Aug 2022 16:52:16 -0500
+
 flexbridge (3.6.3) UNRELEASED; urgency=low
 
   * Fixed