diff --git a/src/testdir/test86.in b/src/testdir/test86.in
index 8124b51..6a10bd7 100644
--- a/src/testdir/test86.in
+++ b/src/testdir/test86.in
@@ -354,7 +354,7 @@
 :" colorcolumn:    string,  window-local
 :" statusline:     string,  window-local/global
 :" autoindent:     boolean, buffer-local
-:" iminsert:       number,  buffer-local
+:" shiftwidth:     number,  buffer-local
 :" omnifunc:       string,  buffer-local
 :" preserveindent: boolean, buffer-local/global
 :" path:           string,  buffer-local/global
@@ -411,7 +411,7 @@
 :let lst+=[['colorcolumn',    '+1',  '+2',  '+3',  'abc',  0,    0,      1    ]]
 :let lst+=[['statusline',     '1',   '2',   '4',   0,      0,    1,      1    ]]
 :let lst+=[['autoindent',     0,     1,     1,     2,      1,    0,      2    ]]
-:let lst+=[['iminsert',       0,     2,     1,     3,      0,    0,      2    ]]
+:let lst+=[['shiftwidth',     0,     2,     1,     3,      0,    0,      2    ]]
 :let lst+=[['omnifunc',       'A',   'B',   'C',   1,      0,    0,      2    ]]
 :let lst+=[['preserveindent', 0,     1,     1,     2,      1,    1,      2    ]]
 :let lst+=[['path',           '.,,', ',,',  '.',   0,      0,    1,      2    ]]
diff --git a/src/testdir/test86.ok b/src/testdir/test86.ok
index 7217d55..b33b538 100644
--- a/src/testdir/test86.ok
+++ b/src/testdir/test86.ok
@@ -232,7 +232,7 @@
   G: 0
   W: 1:0 2:1 3:0 4:1
   B: 1:0 2:1 3:0 4:1
->>> iminsert
+>>> shiftwidth
   p/gopts1! KeyError
   inv: 3! KeyError
   gopts1! KeyError
@@ -241,15 +241,15 @@
   wopts1! KeyError
   wopts2! KeyError
   wopts3! KeyError
-  p/bopts1: 2
-  G: 1
-  W: 1:0 2:2 3:2 4:1
-  B: 1:0 2:2 3:2 4:1
+  p/bopts1: 8
+  G: 8
+  W: 1:0 2:2 3:8 4:1
+  B: 1:0 2:2 3:8 4:1
   del wopts3! KeyError
   del bopts3! ValueError
-  G: 1
-  W: 1:0 2:2 3:2 4:1
-  B: 1:0 2:2 3:2 4:1
+  G: 8
+  W: 1:0 2:2 3:8 4:1
+  B: 1:0 2:2 3:8 4:1
 >>> omnifunc
   p/gopts1! KeyError
   inv: 1! KeyError
@@ -333,7 +333,7 @@
 Current tab pages:
   <tabpage 0>(1): 1 windows, current is <window object (unknown)>
   Windows:
-    <window object (unknown)>(0): displays buffer <buffer test86.in>; cursor is at (954, 0)
+    <window object (unknown)>(0): displays buffer <buffer test86.in>; cursor is at (955, 0)
   <tabpage 1>(2): 1 windows, current is <window object (unknown)>
   Windows:
     <window object (unknown)>(0): displays buffer <buffer 0>; cursor is at (1, 0)
diff --git a/src/testdir/test87.in b/src/testdir/test87.in
index 51425d6..c7f0920 100644
--- a/src/testdir/test87.in
+++ b/src/testdir/test87.in
@@ -341,7 +341,7 @@
 :" colorcolumn:    string,  window-local
 :" statusline:     string,  window-local/global
 :" autoindent:     boolean, buffer-local
-:" iminsert:       number,  buffer-local
+:" shiftwidth:     number,  buffer-local
 :" omnifunc:       string,  buffer-local
 :" preserveindent: boolean, buffer-local/global
 :" path:           string,  buffer-local/global
@@ -398,7 +398,7 @@
 :let lst+=[['colorcolumn',    '+1',  '+2',  '+3',  'abc',  0,    0,      1    ]]
 :let lst+=[['statusline',     '1',   '2',   '4',   0,      0,    1,      1    ]]
 :let lst+=[['autoindent',     0,     1,     1,     2,      1,    0,      2    ]]
-:let lst+=[['iminsert',       0,     2,     1,     3,      0,    0,      2    ]]
+:let lst+=[['shiftwidth',     0,     2,     1,     3,      0,    0,      2    ]]
 :let lst+=[['omnifunc',       'A',   'B',   'C',   1,      0,    0,      2    ]]
 :let lst+=[['preserveindent', 0,     1,     1,     2,      1,    1,      2    ]]
 :let lst+=[['path',           '.,,', ',,',  '.',   0,      0,    1,      2    ]]
diff --git a/src/testdir/test87.ok b/src/testdir/test87.ok
index 7ed51b9..6997b7a 100644
--- a/src/testdir/test87.ok
+++ b/src/testdir/test87.ok
@@ -221,7 +221,7 @@
   G: 0
   W: 1:0 2:1 3:0 4:1
   B: 1:0 2:1 3:0 4:1
->>> iminsert
+>>> shiftwidth
   p/gopts1! KeyError
   inv: 3! KeyError
   gopts1! KeyError
@@ -230,15 +230,15 @@
   wopts1! KeyError
   wopts2! KeyError
   wopts3! KeyError
-  p/bopts1: 2
-  G: 1
-  W: 1:0 2:2 3:2 4:1
-  B: 1:0 2:2 3:2 4:1
+  p/bopts1: 8
+  G: 8
+  W: 1:0 2:2 3:8 4:1
+  B: 1:0 2:2 3:8 4:1
   del wopts3! KeyError
   del bopts3! ValueError
-  G: 1
-  W: 1:0 2:2 3:2 4:1
-  B: 1:0 2:2 3:2 4:1
+  G: 8
+  W: 1:0 2:2 3:8 4:1
+  B: 1:0 2:2 3:8 4:1
 >>> omnifunc
   p/gopts1! KeyError
   inv: 1! KeyError
diff --git a/src/version.c b/src/version.c
index 65683ba..c57d2a4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    962,
+/**/
     961,
 /**/
     960,