diff --git a/src/auto/configure b/src/auto/configure
index c99feb0507..d3aa017fc1 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -13547,8 +13547,13 @@ else case e in #(
 /* end confdefs.h.  */
 
 #include "confdefs.h"
-#ifdef HAVE_TERMCAP_H
+#ifdef HAVE_TERM_H
+# include <term.h>
+#elif defined(HAVE_TERMCAP_H)
 # include <termcap.h>
+#else
+  /* forward declare tgoto */
+  extern char *tgoto(const char *, int, int);
 #endif
 #ifdef HAVE_STRING_H
 # include <string.h>
diff --git a/src/configure.ac b/src/configure.ac
index 6a641c2f2b..aacb45d115 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -3651,8 +3651,13 @@ AC_CACHE_CHECK([whether we talk terminfo], [vim_cv_terminfo],
   [
     AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include "confdefs.h"
-#ifdef HAVE_TERMCAP_H
+#ifdef HAVE_TERM_H
+# include <term.h>
+#elif defined(HAVE_TERMCAP_H)
 # include <termcap.h>
+#else
+  /* forward declare tgoto */
+  extern char *tgoto(const char *, int, int);
 #endif
 #ifdef HAVE_STRING_H
 # include <string.h>
diff --git a/src/version.c b/src/version.c
index b83c5cee5b..c41a20e046 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1794,
 /**/
     1793,
 /**/