diff --git a/CHANGELOG b/CHANGELOG
index 22d9a3660..e528fa265 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,13 +1,20 @@
 ikiwiki (3.20180106) UNRELEASED; urgency=medium
 
   * core: Don't send relative redirect URLs when behind a reverse proxy
+  * core: Escape backticks etc. in directive error messages as HTML
+    entities so that the error message is not subsequently parsed as
+    Markdown
   * mdwn: Enable fenced code blocks, PHP Markdown Extra-style definition
     lists and GitHub-style extensions to HTML tag syntax when used with
     Discount >= 2.2.0 (Closes: #888055)
+  * img: Fix auto-detection of image format (if enabled, which is
+    strongly discouraged) with ImageMagick >= 6.9.8-3
   * build: `set -e` before each `for` loop, so that errors are reliably
     trapped
   * build: Use if/then instead of `||` so that the `-e` flag works
   * build: Ensure that pm_to_blib finishes before rewriting shebang lines
+  * t: Make the img test pass with ImageMagick >= 6.9.8-3
+    (Closes: #891647)
 
  -- Simon McVittie <smcv@debian.org>  Mon, 08 Jan 2018 10:51:10 +0000