diff --git a/src/ChangeLog b/src/ChangeLog
index 7795d3dd221..00c255170ee 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,7 @@
 	* indent.c (sane_tab_width): New function.
 	(current_column, scan_for_column, Findent_to, position_indentation)
 	(compute_motion): Use it.  This is just for clarity.
+	(Fcompute_motion): Don't assume hscroll and tab offset fit in int.
 
 	* image.c (xbm_image_p): Don't assume stated width and height fit in int.
 
diff --git a/src/indent.c b/src/indent.c
index 809631786fc..02d99d14ded 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1743,7 +1743,7 @@ visible section of the buffer, and pass LINE and COL as TOPOS.  */)
   struct window *w;
   Lisp_Object bufpos, hpos, vpos, prevhpos;
   struct position *pos;
-  int hscroll, tab_offset;
+  EMACS_INT hscroll, tab_offset;
 
   CHECK_NUMBER_COERCE_MARKER (from);
   CHECK_CONS (frompos);