diff --git a/src/quickfix.c b/src/quickfix.c
index b6fa2b65d2..cffe635ea2 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -838,6 +838,7 @@ qf_get_next_file_line(qfstate_T *state)
 	// Copy the read part of the line, excluding null-terminator
 	memcpy(state->growbuf, IObuff, IOSIZE - 1);
 	growbuflen = state->linelen;
+	state->growbuf[growbuflen] = NUL;
 
 	for (;;)
 	{
diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim
index 4c61b6b2ee..fd97fd106e 100644
--- a/src/testdir/test_quickfix.vim
+++ b/src/testdir/test_quickfix.vim
@@ -6992,4 +6992,19 @@ func Test_quickfixtextfunc_wipes_buffer()
   bw
 endfunc
 
+func Test_quickfix_longline_noeol()
+  CheckRunVimInTerminal
+  let qf = 'Xquickfix'
+  let args = $"-q {qf}"
+  let after =<< trim [CODE]
+    call writefile(['okay'], "XDONE")
+    qall!
+  [CODE]
+  defer delete("XDONE")
+  call writefile([repeat('A', 1024)], qf, 'bD')
+  call RunVim([], after, args)
+  call WaitForAssert({-> assert_true(filereadable("XDONE"))})
+  call assert_equal(['okay'], readfile("XDONE"))
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 3874a37784..a55c7a1ab6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    159,
 /**/
     158,
 /**/