diff --git a/ChangeLog b/ChangeLog
index 45683295c360b36038e867eb6c52e081af742e66..2e782647a848b4a6ad6affaed6895e2df1e4bb03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat, 07 Oct 2017 12:14:17 +0200  Daniel Friesel <derf+feh@finalrewind.org>
+
+* Release v2.21
+    * Add toggle_fixed_geometry ('g') key binding to toggle window auto-resize
+    * Improve control via terminal input
+    * Fix crash (segmentation fault) when using feh -O in non-index mode
+    * Fix --force-aliasing (and possibly other options) missing from ~/.fehbg
+      when using them for background setting
+
 Thu, 07 Sep 2017 20:20:11 +0200  Daniel Friesel <derf+feh@finalrewind.org>
 
 * Release v2.20