diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ef8f13844..afe218d9f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed bugs
 
+## [0.17.1] - 2024-05-07
+
+### Fixed bugs
+
 * `jj status` no longer scans through the entire history to look for ancestors with conflicts.
 
 ## [0.17.0] - 2024-05-01
diff --git a/Cargo.lock b/Cargo.lock
index eed52b011a..2386c6bf6e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -896,7 +896,7 @@ dependencies = [
 
 [[package]]
 name = "gen-protos"
-version = "0.17.0"
+version = "0.17.1"
 dependencies = [
  "prost-build",
 ]
@@ -1665,7 +1665,7 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
 [[package]]
 name = "jj-cli"
-version = "0.17.0"
+version = "0.17.1"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -1721,7 +1721,7 @@ dependencies = [
 
 [[package]]
 name = "jj-lib"
-version = "0.17.0"
+version = "0.17.1"
 dependencies = [
  "assert_matches",
  "async-trait",
@@ -1777,7 +1777,7 @@ dependencies = [
 
 [[package]]
 name = "jj-lib-proc-macros"
-version = "0.17.0"
+version = "0.17.1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2887,7 +2887,7 @@ dependencies = [
 
 [[package]]
 name = "testutils"
-version = "0.17.0"
+version = "0.17.1"
 dependencies = [
  "async-trait",
  "config",
diff --git a/Cargo.toml b/Cargo.toml
index 6819fa72c7..d61e696b52 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ resolver = "2"
 members = ["cli", "lib", "lib/gen-protos", "lib/proc-macros", "lib/testutils"]
 
 [workspace.package]
-version = "0.17.0"
+version = "0.17.1"
 license = "Apache-2.0"
 rust-version = "1.76"                                 # NOTE: remember to update CI, contributing.md, changelog.md, and flake.nix
 edition = "2021"
@@ -116,8 +116,8 @@ zstd = "0.12.4"
 # put all inter-workspace libraries, i.e. those that use 'path = ...' here in
 # their own (alphabetically sorted) block
 
-jj-lib = { path = "lib", version = "0.17.0" }
-jj-lib-proc-macros = { path = "lib/proc-macros", version = "0.17.0" }
+jj-lib = { path = "lib", version = "0.17.1" }
+jj-lib-proc-macros = { path = "lib/proc-macros", version = "0.17.1" }
 testutils = { path = "lib/testutils" }
 
 # Insta suggests compiling these packages in opt mode for faster testing.