diff --git a/src/mark.c b/src/mark.c
index 540f70b97b..f31f53b527 100644
--- a/src/mark.c
+++ b/src/mark.c
@@ -1047,6 +1047,7 @@ mark_adjust(line1, line2, amount, amount_after)
 #ifdef FEAT_WINDOWS
     tabpage_T	*tab;
 #endif
+    static pos_T initpos = INIT_POS_T(1, 0, 0);
 
     if (line2 < line1 && amount_after == 0L)	    /* nothing to do */
 	return;
@@ -1072,6 +1073,11 @@ mark_adjust(line1, line2, amount, amount_after)
 	/* last change position */
 	one_adjust(&(curbuf->b_last_change.lnum));
 
+	/* last cursor position, if it was set */
+	if (!equalpos(curbuf->b_last_cursor, initpos))
+	    one_adjust(&(curbuf->b_last_cursor.lnum));
+
+
 #ifdef FEAT_JUMPLIST
 	/* list of change positions */
 	for (i = 0; i < curbuf->b_changelistlen; ++i)
diff --git a/src/version.c b/src/version.c
index 7689b56013..af8210a9df 100644
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    800,
 /**/
     799,
 /**/