diff --git a/src/edit.c b/src/edit.c
index 6bc517e..6f30d81 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -8389,7 +8389,7 @@
 
 	    (void)start_redo_ins();
 	    if (cmdchar == 'r' || cmdchar == 'v')
-		stuffReadbuff(ESC_STR);	/* no ESC in redo buffer */
+		stuffRedoReadbuff(ESC_STR);	/* no ESC in redo buffer */
 	    ++RedrawingDisabled;
 	    disabled_redraw = TRUE;
 	    return FALSE;	/* repeat the insert */
diff --git a/src/getchar.c b/src/getchar.c
index 9c1ab0f..d646dc4 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -678,6 +678,17 @@
     add_buff(&readbuf1, s, -1L);
 }
 
+/*
+ * Append string "s" to the redo stuff buffer.
+ * CSI and K_SPECIAL must already have been escaped.
+ */
+    void
+stuffRedoReadbuff(s)
+    char_u	*s;
+{
+    add_buff(&readbuf2, s, -1L);
+}
+
     void
 stuffReadbuffLen(s, len)
     char_u	*s;
diff --git a/src/proto/getchar.pro b/src/proto/getchar.pro
index 897cad3..e90b505 100644
--- a/src/proto/getchar.pro
+++ b/src/proto/getchar.pro
@@ -15,6 +15,7 @@
 void AppendCharToRedobuff __ARGS((int c));
 void AppendNumberToRedobuff __ARGS((long n));
 void stuffReadbuff __ARGS((char_u *s));
+void stuffRedoReadbuff __ARGS((char_u *s));
 void stuffReadbuffLen __ARGS((char_u *s, long len));
 void stuffReadbuffSpec __ARGS((char_u *s));
 void stuffcharReadbuff __ARGS((int c));
diff --git a/src/testdir/Make_amiga.mak b/src/testdir/Make_amiga.mak
index b4d829d..0305424 100644
--- a/src/testdir/Make_amiga.mak
+++ b/src/testdir/Make_amiga.mak
@@ -43,6 +43,7 @@
 		test_qf_title.out \
 		test_changelist.out \
 		test_eval.out \
+		test_insertcount.out \
 		test_options.out
 
 .SUFFIXES: .in .out
@@ -174,4 +175,5 @@
 test_qf_title.out: test_qf_title.in
 test_changelist.out: test_changelist.in
 test_eval.out: test_eval.in
+test_insertcount.out: test_insertcount.in
 test_options.out: test_options.in
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index bd727b8..232e880 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -42,6 +42,7 @@
 		test_qf_title.out \
 		test_changelist.out \
 		test_eval.out \
+		test_insertcount.out \
 		test_options.out
 
 SCRIPTS32 =	test50.out test70.out
diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 0664a95..eb533c9 100644
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -62,6 +62,7 @@
 		test_qf_title.out \
 		test_changelist.out \
 		test_eval.out \
+		test_insertcount.out \
 		test_options.out
 
 SCRIPTS32 =	test50.out test70.out
diff --git a/src/testdir/Make_os2.mak b/src/testdir/Make_os2.mak
index c66489c..0bd0096 100644
--- a/src/testdir/Make_os2.mak
+++ b/src/testdir/Make_os2.mak
@@ -40,6 +40,7 @@
 		test_autoformat_join.out \
 		test_changelist.out \
 		test_eval.out \
+		test_insertcount.out \
 		test_breakindent.out \
 		test_listlbr.out \
 		test_listlbr_utf8.out \
diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index 1a45e35..7ccdf24 100644
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -103,6 +103,7 @@
 	 test_qf_title.out \
 	 test_changelist.out \
 	 test_eval.out \
+	 test_insertcount.out \
 	 test_options.out
 
 # Known problems:
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 4e4671d..f2b2216 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -40,6 +40,7 @@
 		test_qf_title.out \
 		test_changelist.out \
 		test_eval.out \
+		test_insertcount.out \
 		test_options.out
 
 SCRIPTS_GUI = test16.out
diff --git a/src/testdir/test_insertcount.in b/src/testdir/test_insertcount.in
new file mode 100644
index 0000000..c7595b1
--- /dev/null
+++ b/src/testdir/test_insertcount.in
@@ -0,0 +1,14 @@
+Tests for repeating insert and replace.
+
+STARTTEST
+:so small.vim
+:/Second
+4gro
+:/^First/,$wq! test.out
+:" get here when failed and in Insert mode
+:.wq! test.out
+ENDTEST
+
+First line
+Second line
+Last line
diff --git a/src/testdir/test_insertcount.ok b/src/testdir/test_insertcount.ok
new file mode 100644
index 0000000..57afab0
--- /dev/null
+++ b/src/testdir/test_insertcount.ok
@@ -0,0 +1,3 @@
+First line
+ooooecond line
+Last line
diff --git a/src/version.c b/src/version.c
index 3967da2..33bcfba 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    387,
+/**/
     386,
 /**/
     385,