diff --git a/CHANGELOG.md b/CHANGELOG.md
index 938524af..c4b976f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,14 @@ the [discussions section](https://github.com/foresterre/cargo-msrv/discussions).
 
 ## Unreleased
 
+## [0.17.0] - 2024-11-21
+
+### Added
+
+* Rust edition 2024 can now be detected
+
+[0.17.0]: https://github.com/foresterre/cargo-msrv/compare/v0.16.3...v0.17.0
+
 ## [0.16.3] - 2024-11-11
 
 ### Added
diff --git a/src/cli/rust_releases_opts.rs b/src/cli/rust_releases_opts.rs
index eba9eaa9..27c79016 100644
--- a/src/cli/rust_releases_opts.rs
+++ b/src/cli/rust_releases_opts.rs
@@ -52,6 +52,7 @@ pub enum Edition {
     Edition2015,
     Edition2018,
     Edition2021,
+    Edition2024,
 }
 
 impl FromStr for Edition {
@@ -62,6 +63,7 @@ impl FromStr for Edition {
             "2015" => Ok(Self::Edition2015),
             "2018" => Ok(Self::Edition2018),
             "2021" => Ok(Self::Edition2021),
+            "2024" => Ok(Self::Edition2024),
             unknown => Err(ParseEditionError::UnknownEdition(unknown.to_string())),
         }
     }
@@ -73,6 +75,8 @@ impl Edition {
             Self::Edition2015 => BareVersion::ThreeComponents(1, 0, 0),
             Self::Edition2018 => BareVersion::ThreeComponents(1, 31, 0),
             Self::Edition2021 => BareVersion::ThreeComponents(1, 56, 0),
+            // Actual stable version is pending; planning: https://doc.rust-lang.org/nightly/edition-guide/rust-2024/index.html
+            Self::Edition2024 => BareVersion::ThreeComponents(1, 85, 0),
         }
     }
 }