diff --git a/src/nvim/version.c b/src/nvim/version.c
index 825b12bea7..cab2b2f03d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -58,7 +58,7 @@ char *version_cflags = "Compilation: " NVIM_VERSION_CFLAGS;
 // clang-format off
 static const int vim_versions[] = { 801, 802, 900, 901 };
 
-static const int num_patches[] = { 2331, 3783, 1547, 1486 };
+static const int num_patches[] = { 2331, 3786, 1553, 1547 };
 
 static const int *included_patchsets[] = {
   (const int[]) {  // 801
@@ -511,9 +511,7 @@ static const int *included_patchsets[] = {
     // 4748
     4747, 4746, 4745, 4744, 4743,
     // 4742
-    4741, 4740, 4739,
-    // 4738
-    4737,
+    4741, 4740, 4739, 4738, 4737,
     // 4736
     4735, 4734, 4733, 4732, 4731, 4730, 4729, 4728,
     // 4727
@@ -2132,8 +2130,7 @@ static const int *included_patchsets[] = {
     // 399
     398, 397, 396, 395, 394, 393, 392, 391, 390, 389, 388, 387,
     // 386
-    385, 384, 383, 382, 381, 380, 379, 378, 377, 376, 375, 374, 373, 372,
-    // 370-371
+    385, 384, 383, 382, 381, 380, 379, 378, 377, 376, 375, 374, 373, 372, 371, 370,
     369, 368,
     // 367
     366, 365,
@@ -2254,7 +2251,9 @@ static const int *included_patchsets[] = {
     2168,
     // 2167
     2166,
-    // 2162-2165
+    // 2164-2165
+    2163,
+    // 2162
     2161,
     // 2160
     2159, 2158,
@@ -2505,8 +2504,8 @@ static const int *included_patchsets[] = {
     1495, 1494, 1493, 1492, 1491, 1490, 1489, 1488,
     // 1487
     1486, 1485, 1484, 1483,
-    // 1480-1482
-    1479, 1478, 1477, 1476, 1475, 1474, 1473, 1472,
+    // 1481-1482
+    1480, 1479, 1478, 1477, 1476, 1475, 1474, 1473, 1472,
     // 1471
     1470, 1469, 1468, 1467, 1466, 1465, 1464,
     // 1463
@@ -2661,8 +2660,8 @@ static const int *included_patchsets[] = {
     // 1073-1074
     1072, 1071,
     // 1068-1070
-    1067,
-    // 1065-1066
+    1067, 1066,
+    // 1065
     1064,
     // 1063
     1062, 1061,
@@ -2697,9 +2696,7 @@ static const int *included_patchsets[] = {
     // 999
     998, 997,
     // 995-996
-    994,
-    // 993
-    992, 991, 990, 989,
+    994, 993, 992, 991, 990, 989,
     // 988
     987, 986,
     // 985
@@ -2733,9 +2730,7 @@ static const int *included_patchsets[] = {
     // 917-918
     916, 915, 914, 913,
     // 912
-    911, 910,
-    // 909
-    908,
+    911, 910, 909, 908,
     // 907
     906,
     // 905
@@ -2757,8 +2752,8 @@ static const int *included_patchsets[] = {
     // 880-881
     879, 878,
     // 877
-    876, 875,
-    // 873-874
+    876, 875, 874,
+    // 873
     872,
     // 871
     870, 869,
@@ -3100,16 +3095,48 @@ static const int *included_patchsets[] = {
     // 0
   },
   (const int[]) {  // 901
-    2037,
-    // 2036
-    2035, 2034,
-    // 2032-2033
-    2031, 2030,
+    2108, 2107,
+    // 2106
+    2105,
+    // 2104
+    2103, 2102,
+    // 2101
+    2100,
+    // 2099
+    2098, 2097,
+    // 2096
+    2095, 2094, 2093,
+    // 2091-2092
+    2090,
+    // 2089
+    2088, 2087, 2086, 2085,
+    // 2080-2084
+    2079, 2078,
+    // 2076-2077
+    2075,
+    // 2072-2074
+    2071, 2070, 2069, 2068,
+    // 2067
+    2066,
+    // 2065
+    2064,
+    // 2063
+    2062, 2061, 2060, 2059, 2058,
+    // 2057
+    2056, 2055,
+    // 2052-2054
+    2051, 2050,
+    // 2044-2049
+    2043, 2042, 2041, 2040,
+    // 2039
+    2038, 2037, 2036, 2035, 2034,
+    // 2033
+    2032, 2031, 2030,
     // 2029
     2028, 2027, 2026,
     // 2025
-    2024,
-    // 2022-2023
+    2024, 2023,
+    // 2022
     2021, 2020, 2019, 2018, 2017, 2016,
     // 2012-2015
     2011, 2010, 2009, 2008, 2007,
@@ -3118,8 +3145,8 @@ static const int *included_patchsets[] = {
     // 1999-2000
     1998, 1997,
     // 1992-1996
-    1991, 1990,
-    // 1988-1989
+    1991, 1990, 1989,
+    // 1988
     1987,
     // 1984-1986
     1983,
@@ -3129,7 +3156,9 @@ static const int *included_patchsets[] = {
     1974,
     // 1972-1973
     1971, 1970, 1969,
-    // 1966-1968
+    // 1968
+    1967,
+    // 1966
     1965, 1964, 1963, 1962, 1961, 1960,
     // 1959
     1958, 1957,
@@ -3146,8 +3175,8 @@ static const int *included_patchsets[] = {
     // 1921
     1920, 1919, 1918, 1917, 1916, 1915, 1914, 1913,
     // 1911-1912
-    1910, 1909,
-    // 1907-1908
+    1910, 1909, 1908,
+    // 1907
     1906,
     // 1904-1905
     1903,
@@ -3244,11 +3273,7 @@ static const int *included_patchsets[] = {
     // 1655-1656
     1654,
     // 1651-1653
-    1650, 1649,
-    // 1648
-    1647,
-    // 1646
-    1645, 1644,
+    1650, 1649, 1648, 1647, 1646, 1645, 1644,
     // 1643
     1642,
     // 1641
@@ -3357,8 +3382,8 @@ static const int *included_patchsets[] = {
     // 1390-1392
     1389, 1388, 1387, 1386, 1385, 1384, 1383, 1382, 1381, 1380, 1379, 1378, 1377, 1376, 1375, 1374,
     1373,
-    // 1370-1372
-    1369,
+    // 1371-1372
+    1370, 1369,
     // 1368
     1367,
     // 1366
@@ -3374,10 +3399,10 @@ static const int *included_patchsets[] = {
     // 1333-1336
     1332, 1331,
     // 1330
-    1329, 1328, 1327, 1326,
-    // 1323-1325
-    1322, 1321, 1320, 1319, 1318, 1317, 1316, 1315, 1314, 1313, 1312, 1311, 1310, 1309, 1308, 1307,
-    1306, 1305, 1304, 1303, 1302, 1301, 1300, 1299, 1298, 1297, 1296,
+    1329, 1328, 1327, 1326, 1325,
+    // 1324
+    1323, 1322, 1321, 1320, 1319, 1318, 1317, 1316, 1315, 1314, 1313, 1312, 1311, 1310, 1309, 1308,
+    1307, 1306, 1305, 1304, 1303, 1302, 1301, 1300, 1299, 1298, 1297, 1296,
     // 1293-1295
     1292, 1291, 1290, 1289, 1288, 1287, 1286,
     // 1285
@@ -3407,13 +3432,9 @@ static const int *included_patchsets[] = {
     // 1225
     1224,
     // 1223
-    1222, 1221, 1220, 1219, 1218, 1217, 1216, 1215, 1214, 1213, 1212,
-    // 1211
-    1210,
+    1222, 1221, 1220, 1219, 1218, 1217, 1216, 1215, 1214, 1213, 1212, 1211, 1210,
     // 1207-1209
-    1206, 1205, 1204, 1203,
-    // 1202
-    1201, 1200, 1199, 1198, 1197, 1196, 1195, 1194, 1193,
+    1206, 1205, 1204, 1203, 1202, 1201, 1200, 1199, 1198, 1197, 1196, 1195, 1194, 1193,
     // 1192
     1191, 1190, 1189, 1188, 1187, 1186, 1185, 1184,
     // 1183
@@ -3472,8 +3493,8 @@ static const int *included_patchsets[] = {
     1049, 1048,
     // 1047
     1046, 1045,
-    // 1043-1044
-    1042, 1041,
+    // 1044
+    1043, 1042, 1041,
     // 1039-1040
     1038,
     // 1037
@@ -3591,16 +3612,13 @@ static const int *included_patchsets[] = {
     // 712
     711, 710,
     // 709
-    708, 707, 706, 705, 704,
-    // 700-703
-    699, 698,
-    // 697
-    696, 695, 694, 693, 692, 691, 690, 689, 688, 687, 686,
+    708, 707, 706, 705, 704, 703, 702, 701, 700, 699, 698, 697, 696, 695, 694, 693,
+    692, 691, 690, 689, 688, 687, 686,
     // 685
     684, 683,
     // 680-682
-    679, 678, 677, 676, 675, 674, 673, 672,
-    // 670-671
+    679, 678, 677, 676, 675, 674, 673, 672, 671,
+    // 670
     669, 668, 667, 666,
     // 664-665
     663, 662, 661,
@@ -3799,9 +3817,7 @@ static const int *included_patchsets[] = {
     // 125
     124,
     // 122-123
-    121, 120, 119, 118,
-    // 117
-    116, 115, 114, 113, 112, 111, 110, 109, 108,
+    121, 120, 119, 118, 117, 116, 115, 114, 113, 112, 111, 110, 109, 108,
     // 107
     106, 105, 104, 103, 102, 101, 100,
     // 99
@@ -3817,9 +3833,7 @@ static const int *included_patchsets[] = {
     // 64
     63,
     // 62
-    61, 60,
-    // 59
-    58,
+    61, 60, 59, 58,
     // 57
     56,
     // 55