diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim
index b189296b5..6b9fb9ca1 100644
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -241,7 +241,7 @@ endfunc
 
 func Test_map_meta_multibyte()
   imap <M-á> foo
-  call assert_equal('foo', maparg("\<M-á>", 'i'))
+  call assert_match('i  <M-á>\s*foo', execute('imap'))
   iunmap <M-á>
 endfunc
 
diff --git a/src/version.c b/src/version.c
index 5bd944dfc..ee4bb90e5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1858,
 /**/
     1857,
 /**/