diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a2d822..2e32578 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ adheres to [Semantic Versioning][semver].
 * It is now possible to use proper Rust attributes like `#[derive(Debug)]`,
   `#[repr(C)]`, etc (any attribute you want really). This replaces the original
   way this macro had for using derives and specifying representation.
+* Use Rust 2021 edition.
 ## Added
 * A type alias `StateMachine` for `rust_fsm::StateMachine<Impl>` is now
   generated inside the said module.
diff --git a/Cargo.toml b/Cargo.toml
index 84a26dd..e9fcc18 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,2 +1,3 @@
 [workspace]
+resolver = "2"
 members = ["rust-fsm", "rust-fsm-dsl"]
diff --git a/rust-fsm-dsl/Cargo.toml b/rust-fsm-dsl/Cargo.toml
index 8129905..6425e60 100644
--- a/rust-fsm-dsl/Cargo.toml
+++ b/rust-fsm-dsl/Cargo.toml
@@ -10,7 +10,7 @@ categories = ["data-structures", "rust-patterns"]
 keywords = ["fsm"]
 version = "0.6.2"
 authors = ["Yevhenii Babichenko"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 proc-macro = true
diff --git a/rust-fsm/Cargo.toml b/rust-fsm/Cargo.toml
index c2cc933..de434ae 100644
--- a/rust-fsm/Cargo.toml
+++ b/rust-fsm/Cargo.toml
@@ -10,7 +10,7 @@ categories = ["data-structures", "rust-patterns"]
 keywords = ["fsm"]
 version = "0.6.2"
 authors = ["Yevhenii Babichenko"]
-edition = "2018"
+edition = "2021"
 
 [features]
 default = ["std", "dsl"]