diff --git a/src/testdir/test_cursor_func.vim b/src/testdir/test_cursor_func.vim
index e541da886d..9aaeb5d47d 100644
--- a/src/testdir/test_cursor_func.vim
+++ b/src/testdir/test_cursor_func.vim
@@ -125,7 +125,7 @@ func Test_screenpos()
   exe "normal G\<C-Y>\<C-Y>"
   redraw
   let winbar_height = get(wininfo, 'winbar', 0)
-  call assert_equal({'row': winrow + wininfo.height - 1 + winbar_height,
+  call assert_equal({'row': winrow + winheight(winid) - 1 + winbar_height,
 	\ 'col': wincol + 7,
 	\ 'curscol': wincol + 7,
 	\ 'endcol': wincol + 7}, winid->screenpos(line('$'), 8))
diff --git a/src/version.c b/src/version.c
index b5cae5ec4e..68013a0ea5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    605,
 /**/
     604,
 /**/