diff --git a/CHANGELOG.md b/CHANGELOG.md
index a027cca..bbd0e44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
-## Unreleased
+## Version 2.0.0
 
-- Replace macros `MKTAG`, `MKBETAG` and `FFERRTAG` with const functions
+- [Breaking] Replace avutil macros with const fns
+- [Feature] Support ffmpeg 7
+- [Feature] Add ChannelLayout API
+- Many changes to the build process
+- Fix avfiltergraph input/output
+- Migrate to Rust edition 2021 (only 3 years late)
+- Fix PadIter in FFmpeg pre-5.0
 
 ## Version 1.2.2
 
diff --git a/Cargo.toml b/Cargo.toml
index e8592a4..badba61 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ffmpeg-the-third"
-version = "1.3.0+ffmpeg-6.1"
+version = "2.0.0+ffmpeg-7.0"
 edition = "2021"
 
 authors = ["meh. <meh@schizofreni.co>", "Zhiming Wang <i@zhimingwang.org>"]
@@ -13,25 +13,21 @@ repository = "https://github.com/shssoichiro/ffmpeg-the-third"
 keywords = ["ffmpeg", "multimedia", "video", "audio"]
 categories = ["multimedia"]
 
-include = [
-    "LICENSE",
-    "build.rs",
-    "src/",
-]
+include = ["LICENSE", "build.rs", "src/"]
 
 # When changing MSRV: Also update build.yml and README.md
 rust-version = "1.61.0"
 
 [dependencies]
 libc = "0.2"
-bitflags = "1.2"
+bitflags = "2.5"
 
 [dependencies.image]
-version = "0.24"
+version = "0.25"
 optional = true
 
 [dependencies.ffmpeg-sys-the-third]
-version = "1.1.0"
+version = "2.0.0"
 default-features = false
 path = "ffmpeg-sys-the-third"
 
diff --git a/ffmpeg-sys-the-third/Cargo.toml b/ffmpeg-sys-the-third/Cargo.toml
index b96431a..58407bf 100644
--- a/ffmpeg-sys-the-third/Cargo.toml
+++ b/ffmpeg-sys-the-third/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ffmpeg-sys-the-third"
-version = "1.2.0+ffmpeg-6.1"
+version = "2.0.0+ffmpeg-7.0"
 links = "ffmpeg"
 edition = "2021"
 
@@ -11,11 +11,7 @@ authors = [
 ]
 license = "WTFPL"
 
-include = [
-    "LICENSE",
-    "build.rs",
-    "src/"
-]
+include = ["LICENSE", "build.rs", "src/"]
 
 description = "FFI bindings to FFmpeg"
 repository = "https://github.com/shssoichiro/ffmpeg-the-third"
@@ -35,7 +31,7 @@ libc = "0.2"
 [build-dependencies]
 cc = "1.0"
 pkg-config = "0.3"
-bindgen = { version = "0.64", default-features = false, features = ["runtime"] }
+bindgen = { version = "0.69", default-features = false, features = ["runtime"] }
 
 [target.'cfg(target_env = "msvc")'.build-dependencies]
 vcpkg = "0.2"
diff --git a/src/util/channel_layout/mask.rs b/src/util/channel_layout/mask.rs
index 5cd85ee..78c5702 100644
--- a/src/util/channel_layout/mask.rs
+++ b/src/util/channel_layout/mask.rs
@@ -2,6 +2,7 @@ use crate::ffi::*;
 use libc::c_ulonglong;
 
 bitflags! {
+    #[derive(Eq, PartialEq, Copy, Clone)]
     pub struct ChannelLayoutMask: c_ulonglong {
         const FRONT_LEFT            = AV_CH_FRONT_LEFT;
         const FRONT_RIGHT           = AV_CH_FRONT_RIGHT;