diff --git a/src/dosinst.c b/src/dosinst.c
index 608f381f12..e77152fddd 100644
--- a/src/dosinst.c
+++ b/src/dosinst.c
@@ -2495,7 +2495,7 @@ command_line_setup_choices(int argc, char **argv)
 	    int vimfiles_dir_choice = (int)vimfiles_dir_none;
 
 	    init_directories_choice();
-	    if (argv[i + 1][0] != '-')
+	    if (i + 1 < argc && argv[i + 1][0] != '-')
 	    {
 		i++;
 		if (strcmp(argv[i], "vim") == 0)
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 9614f55fe3..56288d78f0 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -863,6 +863,7 @@ func Test_d_file()
   bwipe!
 
   filetype off
+  call delete('Xfile.d')
 endfunc
 
 func Test_dep3patch_file()
diff --git a/src/version.c b/src/version.c
index 94479e3ce5..d82fff51a3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,10 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4467,
+/**/
+    4466,
 /**/
     4465,
 /**/