diff --git a/CHANGES.md b/CHANGES.md
index aba51cf56..d051123ab 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,37 @@
+# 2.17.1 - 28 Nov 2024
+
+## Fixes
+
+* Make `push_path` open in binary mode so it works on non-text files (#1458)
+
+## Documentation
+
+* Use `MaintenanceStatus` for local issues (#1397)
+* Explicitly document that `collect-status` is is run on every hook (#1399)
+* Use our docs URL for the `ogp:url` properties Sphinx generates (#1411)
+* Set the `READTHEDOCS` context variable (#1410)
+* Fix Read the Docs ad placement (#1414)
+* Clarify where `StoredState` is stored, and the upgrade behaviour (#1416)
+* Fix copy 'n' paste error in `stop_services` docstring (#1457)
+
+## Continuous Integration
+
+* Configure the labels for dependabot PRs (#1407)
+* Disable the automatic ops[testing] releasing (#1415)
+* Use the actual poetry command, rather than manually tweaking the file (#1443)
+* Fix broken GitHub variable expansion (#1446)
+* Coverage report generation should also include testing/src/scenario (#1453)
+* Fix PR title CI job concurrency (#1451)
+* Adjust the release process to handle publishing ops and ops[testing] (#1432)
+* A better way than commenting out external repos (#1463)
+* Use more descriptive names for the publish workflows (#1464)
+* Move the XML coverage report to .report (#1465)
+
+## Refactoring
+
+* Import the ops[testing] repository (#1406)
+* Update linting with the latest ruff (#1441)
+
 # 2.17.0 - 26 Sep 2024
 
 ## Features
diff --git a/ops/version.py b/ops/version.py
index f4bd185de..11aea45d2 100644
--- a/ops/version.py
+++ b/ops/version.py
@@ -17,4 +17,4 @@
 This module is NOT to be used when developing charms using ops.
 """
 
-version: str = '2.18.0.dev0'
+version: str = '2.17.1'
diff --git a/testing/CHANGES.md b/testing/CHANGES.md
index b60094e9a..3a2af4191 100644
--- a/testing/CHANGES.md
+++ b/testing/CHANGES.md
@@ -1,3 +1,19 @@
+# Next version - in preparation
+
+## Features
+
+* Make `Context` and `Manager` variadic types by @Batalex (#1445)
+
+## Fixes
+
+* Raise `ModelError` on unknown/error status set (#1417)
+* Require the same object to be in the testing state as in the event (#1468)
+
+## Refactoring
+
+* Fix the testing src-layout structure and use relative imports (#1431)
+* Use `_JujuContext` (#1459)
+
 # 7.0.5 - 20 Sep 2024
 
 ## Features