diff --git a/src/help.c b/src/help.c
index a36b671..519edca 100644
--- a/src/help.c
+++ b/src/help.c
@@ -836,8 +836,6 @@
 				    continue;
 				t2 = gettail(f2);
 				e2 = vim_strrchr(t2, '.');
-				if (e1 == NULL || e2 == NULL)
-				    continue;
 				if (e1 - f1 != e2 - f2
 					    || fnamencmp(f1, f2, e1 - f1) != 0)
 				    continue;
diff --git a/src/version.c b/src/version.c
index 2c280af..83e054a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4000,
+/**/
     3999,
 /**/
     3998,