diff --git a/src/map.c b/src/map.c
index ff117dc..8d60eee 100644
--- a/src/map.c
+++ b/src/map.c
@@ -84,10 +84,10 @@
     vim_free(mp->m_str);
     vim_free(mp->m_orig_str);
     *mpp = mp->m_next;
-    vim_free(mp);
 #ifdef FEAT_EVAL
     reset_last_used_map(mp);
 #endif
+    vim_free(mp);
 }
 
 /*
diff --git a/src/version.c b/src/version.c
index 3846e39..53f1619 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4150,
+/**/
     4149,
 /**/
     4148,