diff --git a/src/map.c b/src/map.c
index 181aa654b6..6ad938d7ed 100644
--- a/src/map.c
+++ b/src/map.c
@@ -85,6 +85,9 @@ map_free(mapblock_T **mpp)
     vim_free(mp->m_orig_str);
     *mpp = mp->m_next;
     vim_free(mp);
+#ifdef FEAT_EVAL
+    reset_last_used_map();
+#endif
 }
 
 /*
diff --git a/src/version.c b/src/version.c
index b658ec7ae5..ec1ba92d14 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4111,
 /**/
     4110,
 /**/