diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index d5765d1..133993d 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -215,7 +215,7 @@
 for name in s:GetSwapFileList()
   call delete(name)
 endfor
-unlet name
+unlet! name
 
 
 " Invoked when a test takes too much time.
diff --git a/src/version.c b/src/version.c
index fbf2999..8750223 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2058,
+/**/
     2057,
 /**/
     2056,