diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d392849..8ead563d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -91,6 +91,8 @@
   background color for empty pixels instead of the default background
   color (https://codeberg.org/dnkl/foot/issues/391).
 * Sixel decoding optimized; up to 100% faster in some cases.
+* Reported sixel “max geometry” from current window size, to the
+  configured maximum size (defaulting to 10000x10000).
 
 
 ### Deprecated
diff --git a/sixel.c b/sixel.c
index 20f15cab..96ba9214 100644
--- a/sixel.c
+++ b/sixel.c
@@ -1375,8 +1375,8 @@ sixel_geometry_set(struct terminal *term, unsigned width, unsigned height)
 void
 sixel_geometry_report_max(struct terminal *term)
 {
-    unsigned max_width = term->cols * term->cell_width;
-    unsigned max_height = term->rows * term->cell_height;
+    unsigned max_width = term->sixel.max_width;
+    unsigned max_height = term->sixel.max_height;
 
     char reply[64];
     size_t n = xsnprintf(reply, sizeof(reply), "\033[?2;0;%u;%uS", max_width, max_height);