diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..24dd03e2
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+CHANGELOG-rust.md merge=union
+CHANGELOG-python.md merge=union
diff --git a/CHANGELOG.md b/CHANGELOG-python.md
similarity index 93%
rename from CHANGELOG.md
rename to CHANGELOG-python.md
index 7283708d..382ac1da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG-python.md
@@ -1,9 +1,15 @@
 # Changelog
 
+This changelog tracks the Python `svdtools` project. See
+[CHANGELOG-rust.md](CHANGELOG-rust.md) for the Rust `svdtools` project.
+
 ## [Unreleased]
 
-* Provide option to opt out of regex replace of 0's in description when creating arrays
-* Add `_clear_fields` in `Device` and `Peripheral`
+## [v0.1.21] 2022-01-15
+
+* Provide option to opt out of regex replace of 0's in description when
+  creating arrays by using a custom `description` attribute (#90, #95)
+* Add `_clear_fields` in `Device` and `Peripheral` (#93)
 
 ## [v0.1.20] 2021-10-06
 
@@ -135,7 +141,8 @@
 * Add `click` CLI, to call as `svd patch <yaml-file>`
 * Add packaging
 
-[Unreleased]: https://github.com/stm32-rs/stm32-rs/compare/v0.1.20...HEAD
+[Unreleased]: https://github.com/stm32-rs/stm32-rs/compare/v0.1.21...HEAD
+[v0.1.21]: https://github.com/stm32-rs/stm32-rs/compare/v0.1.20...v0.1.21
 [v0.1.20]: https://github.com/stm32-rs/stm32-rs/compare/v0.1.19...v0.1.20
 [v0.1.19]: https://github.com/stm32-rs/stm32-rs/compare/v0.1.18...v0.1.19
 [v0.1.18]: https://github.com/stm32-rs/stm32-rs/compare/v0.1.17...v0.1.18
diff --git a/CHANGELOG-rust.md b/CHANGELOG-rust.md
new file mode 100644
index 00000000..00da4ac6
--- /dev/null
+++ b/CHANGELOG-rust.md
@@ -0,0 +1,22 @@
+# Changelog
+
+This changelog tracks the Rust `svdtools` project. See
+[CHANGELOG-python.md](CHANGELOG-python.md) for the Python `svdtools` project.
+
+## [Unreleased]
+
+## [v0.2.0] 2022-01-15
+
+* Use `svd-parser` 0.13.1
+* Add `_clear_fields` in `Device` and `Peripheral` (#90)
+* Add new `convert` command to convert between SVD (XML), JSON, and YAML (#92)
+* Provide option to opt out of regex replace of 0's in description when
+  creating arrays by using a custom `description` attribute (#95)
+
+## [v0.1.0] 2021-12-09
+
+* Initial release with feature-parity with the Python project.
+
+[Unreleased]: https://github.com/stm32-rs/stm32-rs/compare/v0.2.0...HEAD
+[v0.2.0]: https://github.com/stm32-rs/svdtools/compare/35c3a79...v0.2.0
+[v0.1.0]: https://github.com/stm32-rs/svdtools/pull/84
diff --git a/Cargo.toml b/Cargo.toml
index 7da24c9b..f36f48b7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,11 +20,9 @@ keywords = [
 ]
 license = "MIT OR Apache-2.0"
 readme = "README.md"
-include = ["/res", "/src", "/tests", "CHANGELOG.md", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
+include = ["/res", "/src", "/tests", "CHANGELOG-rust.md", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 clap = { version = "3.0", features = ["derive"] }
 serde = { version = "1.0", features = ["derive"] }
diff --git a/svdtools/VERSION b/svdtools/VERSION
index baa98378..79062996 100644
--- a/svdtools/VERSION
+++ b/svdtools/VERSION
@@ -1 +1 @@
-0.1.20
+0.1.21