diff --git a/CHANGELOG.md b/CHANGELOG.md
index 149140424..5868dbadb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 Changelog
 ==========
 
+Version 6.18.0 *(2022-04-08)*
+----------------------------
+
+ * Added Material You theme support on Android 12+
+ * Open the proper view at clicking on the event list widget
+ * Added some stability, translation and UX improvements
+
 Version 6.17.4 *(2022-03-16)*
 ----------------------------
 
diff --git a/fastlane/metadata/android/en-US/changelogs/217.txt b/fastlane/metadata/android/en-US/changelogs/217.txt
new file mode 100644
index 000000000..8b4752d7d
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/217.txt
@@ -0,0 +1,3 @@
+ * Added Material You theme support on Android 12+
+ * Open the proper view at clicking on the event list widget
+ * Added some stability, translation and UX improvements