diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78c8dbb3..5881945f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,14 @@ Changes for the upcoming release can be found in [changelog.d](https://github.co
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-6.1.1'></a>
+## 6.1.1 (2023-07-06)
+
+### Bug fixes
+
+- Rather than dumping the full monkey data when summarizing flocks, which can cause long enough delays that in-progress calls fail due to the huge amount of timing data, extract only the success and failure count from the running business. This should be considerably faster and avoid timeout problems.
+- Improve error reporting by catching exceptions thrown while sending code to the lab WebSocket for execution.
+
 <a id='changelog-6.1.0'></a>
 ## 6.1.0 (2023-05-31)
 
diff --git a/changelog.d/20230605_092121_rra_DM_39552.md b/changelog.d/20230605_092121_rra_DM_39552.md
deleted file mode 100644
index ded4d2d1..00000000
--- a/changelog.d/20230605_092121_rra_DM_39552.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### Bug fixes
-
-- Improve error reporting by catching exceptions thrown while sending code to the lab WebSocket for execution.
diff --git a/changelog.d/20230706_111300_rra_DM_39552.md b/changelog.d/20230706_111300_rra_DM_39552.md
deleted file mode 100644
index eed53a3d..00000000
--- a/changelog.d/20230706_111300_rra_DM_39552.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### Bug fixes
-
-- Rather than dumping the full monkey data when summarizing flocks, which can cause long enough delays that in-progress calls fail due to the huge amount of timing data, extract only the success and failure count from the running business. This should be considerably faster and avoid timeout problems.
diff --git a/requirements/main.in b/requirements/main.in
index 7f21f740..c96fbe05 100644
--- a/requirements/main.in
+++ b/requirements/main.in
@@ -13,7 +13,7 @@ uvicorn[standard]
 # Other dependencies.
 GitPython
 aiojobs
-click
+click!=8.1.4  # see https://github.com/pallets/click/issues/2558
 httpx
 httpx-sse
 jinja2