diff --git a/src/auto/configure b/src/auto/configure
index 8b559f5574..5c0d3d614f 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -2968,6 +2968,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
 ac_config_headers="$ac_config_headers auto/config.h:config.h.in"
 
 
diff --git a/src/configure.ac b/src/configure.ac
index 0cfe836acd..983c582247 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -30,6 +30,10 @@ dnl truth for both UNIX and non-UNIX platforms.
 dnl
 dnl Therefore we call AC_INIT without arguments.
 AC_INIT
+
+dnl Use vim.h as the source-tree anchor: AC_CONFIG_SRCDIR verifies that
+dnl configure is run in (or pointed to) the correct source directory.
+dnl vim.h is always present at the top level.
 AC_CONFIG_SRCDIR([vim.h])
 AC_CONFIG_HEADERS(auto/config.h:config.h.in)
 
diff --git a/src/version.c b/src/version.c
index 42949896ab..4525356fb8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -724,6 +724,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1671,
 /**/
     1670,
 /**/