diff --git a/ChangeLog b/ChangeLog
index ce5e3c402..5d3920c0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
   to Ulf Eliasson).
 - TW-1583 Invalid ID displayed for first report after done/delete (thanks to
   Ulf Eliasson).
+- TW-1587 Fix and improve example on-exit hook, adjust to new hooks API
+  (thanks to Jochen Sprickerhof).
 - Setting 'bulk' to zero is interpreted as infinity, which means there is no
   amount of changes that is considered dangerous (thanks to Tomas Babej).
 
diff --git a/scripts/hooks/on-exit b/scripts/hooks/on-exit
index 572b534c9..ea830d9e6 100755
--- a/scripts/hooks/on-exit
+++ b/scripts/hooks/on-exit
@@ -5,9 +5,16 @@
 
 # Output:
 # - Optional feedback/error.
-echo 'on-exit'
+
+n=0
+while read modified_task
+do
+  n=$(($n + 1))
+done
+
+echo "on-exit: Counted $n added/modified tasks."
 
 # Status:
-# - 0:     JSON ignored, non-JSON is feedback.
-# - non-0: JSON ignored, non-JSON is error.
+# - 0:     Non-JSON is feedback.
+# - non-0: Non-JSON is error.
 exit 0