diff --git a/CHANGES b/CHANGES
index b4a0d767..ee1945f3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,11 @@
 CHANGES FROM 2.9 to X.X
 
+* Hooks are now stored in the options tree as array options, allowing them to
+  have multiple separate commands. set-hook and show-hooks remain but
+  set-option and show-options can now also be used (show-options will only show
+  hooks if given the -H flag). Hooks with multiple commands are run in index
+  order.
+
 * Automatically scroll if dragging to create a selection with the mouse and the
   cursor reaches the top or bottom line.
 
diff --git a/TODO b/TODO
index 220e4eb9..59c31cc8 100644
--- a/TODO
+++ b/TODO
@@ -147,7 +147,6 @@
 
 TODO soonish maybe:
 
-- Store hooks as options, issue 1619.
 - -E flag to pass environment to new-*, issue 1498.
 - Copy mode searching is slow when there is a big history, issue 1545.
 - Grid "block" stuff, issue 1269. Can be used potentially for compression of