diff --git a/src/auto/configure b/src/auto/configure
index aea0013d44..8892042836 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -15519,7 +15519,7 @@ fi
 if test "$enable_multibyte" = "yes"; then
   cflags_save=$CFLAGS
   ldflags_save=$LDFLAGS
-  if test -n "$x_includes" ; then
+  if test "x$x_includes" != "xNONE" ; then
     CFLAGS="$CFLAGS -I$x_includes"
     LDFLAGS="$X_LIBS $LDFLAGS -lX11"
     { $as_echo "$as_me:$LINENO: checking whether X_LOCALE needed" >&5
diff --git a/src/configure.in b/src/configure.in
index ff1bd0c9ce..6821417221 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -2952,7 +2952,7 @@ dnl Check if X_LOCALE should be defined.
 if test "$enable_multibyte" = "yes"; then
   cflags_save=$CFLAGS
   ldflags_save=$LDFLAGS
-  if test -n "$x_includes" ; then
+  if test "x$x_includes" != "xNONE" ; then
     CFLAGS="$CFLAGS -I$x_includes"
     LDFLAGS="$X_LIBS $LDFLAGS -lX11"
     AC_MSG_CHECKING(whether X_LOCALE needed)
diff --git a/src/version.c b/src/version.c
index e5e1307fc7..0253013fbe 100644
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    159,
 /**/
     158,
 /**/