diff --git a/src/feature.h b/src/feature.h
index d100d6b..a6a1599 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -1172,7 +1172,13 @@
  *			when --servername is not passed on the command line.
  */
 #if defined(FEAT_CLIENTSERVER) && !defined(FEAT_AUTOSERVERNAME)
+# ifdef WIN3264
+    /* Always enabled on MS-Windows. */
+#  define FEAT_AUTOSERVERNAME
+# else
+    /* Enable here if you don't use configure. */
 /* # define FEAT_AUTOSERVERNAME */
+# endif
 #endif
 
 /*
diff --git a/src/version.c b/src/version.c
index 6590bf6..c4e5d35 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1297,
+/**/
     1296,
 /**/
     1295,