diff --git a/src/nvim/version.c b/src/nvim/version.c
index a84c34a131..75c03f674a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -59,7 +59,7 @@ char *version_cflags = "Compilation: " NVIM_VERSION_CFLAGS;
 
 static const int vim_versions[] = { 801, 802, 900, 901, 902 };
 
-static const int num_patches[] = { 2332, 3843, 1604, 1655, 413 };
+static const int num_patches[] = { 2332, 3845, 1605, 1655, 438 };
 
 static const int *included_patchsets[] = {
   (const int[]) {  // 801
@@ -1521,9 +1521,7 @@ static const int *included_patchsets[] = {
     // 2122
     2121,
     // 2120
-    2119, 2118,
-    // 2117
-    2116, 2115, 2114, 2113, 2112, 2111, 2110, 2109, 2108, 2107, 2106,
+    2119, 2118, 2117, 2116, 2115, 2114, 2113, 2112, 2111, 2110, 2109, 2108, 2107, 2106,
     // 2105
     2104, 2103, 2102,
     // 2101
@@ -1601,8 +1599,8 @@ static const int *included_patchsets[] = {
     1893, 1892,
     // 1891
     1890,
-    // 1888-1889
-    1887, 1886, 1885, 1884, 1883, 1882, 1881, 1880,
+    // 1889
+    1888, 1887, 1886, 1885, 1884, 1883, 1882, 1881, 1880,
     // 1879
     1878, 1877,
     // 1876
@@ -2481,8 +2479,8 @@ static const int *included_patchsets[] = {
     // 1338
     1337, 1336, 1335,
     // 1333-1334
-    1332, 1331, 1330, 1329,
-    // 1325-1328
+    1332, 1331, 1330, 1329, 1328,
+    // 1325-1327
     1324, 1323, 1322,
     // 1320-1321
     1319, 1318,
@@ -3717,15 +3715,26 @@ static const int *included_patchsets[] = {
     // 0
   },
   (const int[]) {  // 902
-    677, 676, 675,
-    // 674
-    673,
-    // 664-672
+    699, 698,
+    // 690-697
+    689,
+    // 687-688
+    686,
+    // 685
+    684, 683, 682,
+    // 681
+    680,
+    // 679
+    678, 677, 676, 675, 674, 673, 672, 671,
+    // 669-670
+    668, 667,
+    // 666
+    665,
+    // 664
     663, 662,
-    // 657-661
-    656,
-    // 654-655
-    653, 652, 651, 650, 649, 648, 647, 646, 645, 644,
+    // 661
+    660, 659, 658, 657, 656, 655, 654, 653, 652, 651, 650, 649, 648, 647, 646, 645,
+    644,
     // 643
     642, 641, 640, 639,
     // 636-638
@@ -3821,7 +3830,9 @@ static const int *included_patchsets[] = {
     413,
     // 410-412
     409, 408,
-    // 401-407
+    // 407
+    406,
+    // 401-405
     400,
     // 397-399
     396, 395, 394, 393,
@@ -3898,17 +3909,17 @@ static const int *included_patchsets[] = {
     // 227-229
     226, 225, 224, 223, 222,
     // 221
-    220, 219,
-    // 218
-    217, 216, 215,
+    220, 219, 218, 217, 216, 215,
     // 211-214
     210, 209,
-    // 205-208
+    // 208
+    207,
+    // 205-206
     204,
     // 203
     202, 201,
-    // 196-200
-    195,
+    // 197-200
+    196, 195,
     // 192-194
     191,
     // 190