diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98917777..62e08d6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 ## 0.18.0 (unreleased)
 
+- Fix LFI in `zola serve`
+- Do not panic when root directory or config file not found
+- Fix base_url link attributes in atom templates
+- Use all authors for atom templates
+- Always sort page/section assets by filename
+- Allow setting attributes to lazy load all images from Config.toml
+- Fix HTML generated in class based highlighting with line numbers
+- Add a `replace_re` filter
+- Speed up `zola check`
+- Add search.index_format into the serialized config in the templates
+
 ## 0.17.2 (2023-03-19)
 
 - Fix one more invalid error with colocated directories
diff --git a/Cargo.lock b/Cargo.lock
index ebbfb6ef..b70ef154 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4362,7 +4362,7 @@ dependencies = [
 
 [[package]]
 name = "zola"
-version = "0.17.2"
+version = "0.18.0"
 dependencies = [
  "clap 4.1.8",
  "clap_complete",
diff --git a/Cargo.toml b/Cargo.toml
index b1058526..3e907e01 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zola"
-version = "0.17.2"
+version = "0.18.0"
 authors = ["Vincent Prouillet <hello@vincentprouillet.com>"]
 edition = "2018"
 license = "MIT"