diff --git a/src/auto/configure b/src/auto/configure
index df4c962..7e46662 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -7473,20 +7473,34 @@
 # Check whether --enable-terminal was given.
 if test "${enable_terminal+set}" = set; then :
   enableval=$enable_terminal; enable_terminal="yes"
+else
+  enable_terminal="auto"
 fi
 
-if test "$enable_terminal" = "yes"; then
+if test "$enable_terminal" = "yes" || test "$enable_terminal" = "auto" -a "x$features" = "xhuge" ; then
   if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use terminal emulator with tiny or small features" >&5
 $as_echo "cannot use terminal emulator with tiny or small features" >&6; }
     enable_terminal="no"
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+    if test "$enable_terminal" = "auto"; then
+      enable_terminal="yes"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to yes" >&5
+$as_echo "defaulting to yes" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+    fi
   fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  if test "$enable_terminal" = "auto"; then
+    enable_terminal="no"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to no" >&5
+$as_echo "defaulting to no" >&6; }
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
+  fi
 fi
 if test "$enable_terminal" = "yes"; then
   $as_echo "#define FEAT_TERMINAL 1" >>confdefs.h
diff --git a/src/configure.ac b/src/configure.ac
index ea4df8f..918c36c 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -2031,16 +2031,26 @@
 AC_MSG_CHECKING(--enable-terminal argument)
 AC_ARG_ENABLE(terminal,
 	[  --enable-terminal       Enable terminal emulation support.],
-	[enable_terminal="yes"], )
-if test "$enable_terminal" = "yes"; then
+	[enable_terminal="yes"], [enable_terminal="auto"])
+if test "$enable_terminal" = "yes" || test "$enable_terminal" = "auto" -a "x$features" = "xhuge" ; then
   if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
     AC_MSG_RESULT([cannot use terminal emulator with tiny or small features])
     enable_terminal="no"
   else
-    AC_MSG_RESULT(yes)
+    if test "$enable_terminal" = "auto"; then
+      enable_terminal="yes"
+      AC_MSG_RESULT(defaulting to yes)
+    else
+      AC_MSG_RESULT(yes)
+    fi
   fi
 else
-  AC_MSG_RESULT(no)
+  if test "$enable_terminal" = "auto"; then
+    enable_terminal="no"
+    AC_MSG_RESULT(defaulting to no)
+  else
+    AC_MSG_RESULT(no)
+  fi
 fi
 if test "$enable_terminal" = "yes"; then
   AC_DEFINE(FEAT_TERMINAL)
diff --git a/src/version.c b/src/version.c
index 4a5282f..45537fe 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1050,
+/**/
     1049,
 /**/
     1048,