diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
index 865a03b..c833dd8 100644
--- a/src/testdir/test_timers.vim
+++ b/src/testdir/test_timers.vim
@@ -117,6 +117,13 @@
   call assert_equal([], timer_info(id))
 
   call assert_fails('call timer_info("abc")', 'E39:')
+
+  " check repeat count inside the callback
+  let g:timer_repeat = []
+  let tid = timer_start(10, {tid -> execute("call add(g:timer_repeat, timer_info(tid)[0].repeat)")}, #{repeat: 3})
+  sleep 100m
+  call assert_equal([2, 1, 0], g:timer_repeat)
+  unlet g:timer_repeat
 endfunc
 
 func Test_timer_stopall()
diff --git a/src/time.c b/src/time.c
index 362fd46..bb4a202 100644
--- a/src/time.c
+++ b/src/time.c
@@ -696,7 +696,8 @@
     dict_add_number(dict, "remaining", (long)remaining);
 
     dict_add_number(dict, "repeat",
-		    (long)(timer->tr_repeat < 0 ? -1 : timer->tr_repeat + 1));
+	    (long)(timer->tr_repeat < 0 ? -1
+			     : timer->tr_repeat + (timer->tr_firing ? 0 : 1)));
     dict_add_number(dict, "paused", (long)(timer->tr_paused));
 
     di = dictitem_alloc((char_u *)"callback");
diff --git a/src/version.c b/src/version.c
index c3e34e4..473b934 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3768,
+/**/
     3767,
 /**/
     3766,