diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba968d4b9..1fbaaf5c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 ## Unreleased
 
+## 1.18.0 / 2023-12-22
+
+* [FEATURE] promlint: Allow creation of custom metric validations. #1311
+* [FEATURE] api: Change HTTP Client into interface, so users can use customized clients, e.g. with retries on 429. #1387
+* [BUGFIX] histograms: Add timer to reset ASAP after bucket limiting has happened. #1367
+* [BUGFIX] testutil: Fix comparison of metrics with empty Help strings. #1378
+* [BUGFIX] Fix building client_golang in wasip1 OS. #1350
+* [ENHANCEMENT] Improved performance of `MetricVec.WithLabelValues(...)`. #1360
+
 ## 1.17.0 / 2023-09-27
 
 * [CHANGE] Minimum required go version is now 1.19 (we also test client_golang against new 1.21 version). #1325
diff --git a/VERSION b/VERSION
index 092afa15d..84cc52946 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.17.0
+1.18.0