diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d5bd037467..ecc3cf07597 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,27 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Breaking changes
 
+### Deprecations
+
+### New features
+
+### Fixed bugs
+
+## [0.28.0] - 2025-04-02
+
+### Release highlights
+
+* jj's configuration can now be split into multiple files more easily.
+
+* `jj resolve` now accepts built-in tools `:ours` and `:theirs`.
+
+* In colocated repos, newly-created files will now appear in `git diff`.
+
+* A long-standing bug relating to empty files in the built-in diff editor was
+  fixed. [#3702](https://github.com/jj-vcs/jj/issues/3702)
+
+### Breaking changes
+
 * The minimum supported Rust version (MSRV) is now 1.84.0.
 
 * The `git.push-branch-prefix` config has been removed in favor of
@@ -124,6 +145,43 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 * `jj fix` could previously create new conflicts when a descendant of a fixed
   revision was already correctly formatted.
 
+### Contributors
+
+Thanks to the people who made this release happen!
+
+* Aleksey Kuznetsov (@zummenix)
+* Anton Älgmyr (@algmyr)
+* Austin Seipp (@thoughtpolice)
+* Baltasar Dinis (@bsdinis)
+* Benjamin Tan (@bnjmnt4n)
+* Brandon Hall (@tenkabuto)
+* Caleb White (@calebdw)
+* Daniel Luz (@mernen)
+* David Rieber (@drieber)
+* demize (@demize)
+* Emily (@emilazy)
+* Evan Mesterhazy (@emesterhazy)
+* Fedor Sheremetyev (@sheremetyev)
+* George Christou (@gechr)
+* Ilya Grigoriev (@ilyagr)
+* Jakob Hellermann (@jakobhellermann)
+* Jo Liss (@joliss)
+* Joachim Desroches (@jedesroches)
+* Johannes Altmanninger (@krobelus)
+* Jonathan Gilchrist (@jgilchrist)
+* Kenyon Ralph (@kenyon)
+* Lucas Garron (@lgarron)
+* Martin von Zweigbergk (@martinvonz)
+* Nick Pupko (@npupko)
+* Philip Metzger (@PhilipMetzger)
+* Raphael Borun Das Gupta (@das-g)
+* Remo Senekowitsch (@senekor)
+* Robin Stocker (@robinst)
+* Scott Taylor (@scott2000)
+* Siva Mahadevan (@svmhdvn)
+* Vincent Ging Ho Yim (@cenviity)
+* Yuya Nishihara (@yuja)
+
 ## [0.27.0] - 2025-03-05
 
 ### Release highlights
diff --git a/Cargo.lock b/Cargo.lock
index b5586dcc778..130fca77317 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1021,7 +1021,7 @@ dependencies = [
 
 [[package]]
 name = "gen-protos"
-version = "0.27.0"
+version = "0.28.0"
 dependencies = [
  "prost-build",
 ]
@@ -2270,7 +2270,7 @@ dependencies = [
 
 [[package]]
 name = "jj-cli"
-version = "0.27.0"
+version = "0.28.0"
 dependencies = [
  "assert_cmd",
  "assert_matches",
@@ -2329,7 +2329,7 @@ dependencies = [
 
 [[package]]
 name = "jj-lib"
-version = "0.27.0"
+version = "0.28.0"
 dependencies = [
  "assert_matches",
  "async-trait",
@@ -2388,7 +2388,7 @@ dependencies = [
 
 [[package]]
 name = "jj-lib-proc-macros"
-version = "0.27.0"
+version = "0.28.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3919,7 +3919,7 @@ dependencies = [
 
 [[package]]
 name = "testutils"
-version = "0.27.0"
+version = "0.28.0"
 dependencies = [
  "async-trait",
  "bstr",
diff --git a/Cargo.toml b/Cargo.toml
index e32e7ff1481..04deb883bc1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ resolver = "3"
 members = ["cli", "lib", "lib/gen-protos", "lib/proc-macros", "lib/testutils"]
 
 [workspace.package]
-version = "0.27.0"
+version = "0.28.0"
 license = "Apache-2.0"
 rust-version = "1.84" # NOTE: remember to update CI, contributing.md, changelog.md, and install-and-setup.md
 edition = "2021"
@@ -127,8 +127,8 @@ winreg = "0.52"
 # put all inter-workspace libraries, i.e. those that use 'path = ...' here in
 # their own (alphabetically sorted) block
 
-jj-lib = { path = "lib", version = "0.27.0", default-features = false }
-jj-lib-proc-macros = { path = "lib/proc-macros", version = "0.27.0" }
+jj-lib = { path = "lib", version = "0.28.0", default-features = false }
+jj-lib-proc-macros = { path = "lib/proc-macros", version = "0.28.0" }
 testutils = { path = "lib/testutils", default-features = false }
 
 [workspace.lints.clippy]
diff --git a/docs/releasing.md b/docs/releasing.md
index 4122d1d01d1..76a88569476 100644
--- a/docs/releasing.md
+++ b/docs/releasing.md
@@ -13,10 +13,10 @@ Producing the list of contributors is a bit annoying. The current suggestion is
 to run something like this:
 
 ```shell
-root=v0.25.0
+root=$(jj log --no-graph -r 'heads(tags())' -T 'commit_id')
 for i in $(seq 5); do
     gh api "/repos/jj-vcs/jj/compare/$root...main?per_page=100;page=$i"
-done | jq -r '.commits[] | "* " + .commit.author.name + " (@" + .author.login + ")"' | sort -fu
+done | jq -r '.commits[] | select(.author.login | endswith("[bot]") | not) | "* " + .commit.author.name + " (@" + .author.login + ")"' | sort -fu
 ```
 
 https://docs.github.com/en/rest/commits/commits?apiVersion=2022-11-28#compare-two-commits