diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim
index 4d2c477..740863e 100644
--- a/src/testdir/test_options.vim
+++ b/src/testdir/test_options.vim
@@ -387,8 +387,10 @@
   for var in  ['$TMPDIR', '$TMP', '$TEMP']
     if exists(var)
       let varvalue = substitute(expand(var), '\\', '/', 'g')
-      let found = (index(bsklist, varvalue.'/*') >= 0)
-      call assert_true(found, var . ' not in option bsk: ' . &bsk)
+      let varvalue = substitute(varvalue, '/$', '', '')
+      let varvalue .= '/*'
+      let found = (index(bsklist, varvalue) >= 0)
+      call assert_true(found, var . ' (' . varvalue . ') not in option bsk: ' . &bsk)
     endif
   endfor
 endfunc
diff --git a/src/version.c b/src/version.c
index 3652f43..97ef0c1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -784,6 +784,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    853,
+/**/
     852,
 /**/
     851,