diff --git a/src/evalfunc.c b/src/evalfunc.c
index 7d3f87521..07c757517 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -3447,12 +3447,9 @@ f_foldtext(typval_T *argvars UNUSED, typval_T *rettv)
 	    && dashes != NULL)
     {
 	/* Find first non-empty line in the fold. */
-	while (lnum < (linenr_T)get_vim_var_nr(VV_FOLDEND))
-	{
+	for (lnum = foldstart; lnum < foldend; ++lnum)
 	    if (!linewhite(lnum))
 		break;
-	    ++lnum;
-	}
 
 	/* Find interesting text in this line. */
 	s = skipwhite(ml_get(lnum));
diff --git a/src/version.c b/src/version.c
index e1fcacac2..8ebd30955 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2065,
 /**/
     2064,
 /**/