diff --git a/src/uninstall.c b/src/uninstall.c
index b2a20cded8..ef0538a140 100644
--- a/src/uninstall.c
+++ b/src/uninstall.c
@@ -233,6 +233,10 @@ remove_batfiles(int doit)
     int	 i;
     int	 found = 0;
 
+    // avoid looking in the "installdir" by chdir to system root
+    mch_chdir(sysdrive);
+    mch_chdir("\\");
+
     for (i = 1; i < TARGET_COUNT; ++i)
     {
 	batfile_path = searchpath_save(targets[i].batname);
@@ -249,6 +253,8 @@ remove_batfiles(int doit)
 	    free(batfile_path);
 	}
     }
+
+    mch_chdir(installdir);
     return found;
 }
 
diff --git a/src/version.c b/src/version.c
index 6a5f2e779c..7ca6baacf1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    236,
 /**/
     235,
 /**/