diff --git a/Makefile.def b/Makefile.def
index 7b739ff..725cb04 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -103,11 +103,7 @@ host_modules= { module= gdb; };
 host_modules= { module= expect; };
 host_modules= { module= guile; };
 host_modules= { module= tk; };
-host_modules= { module= libtermcap; no_check=true; 
-                missing=mostlyclean;
-                missing=clean;
-                missing=distclean;
-                missing=maintainer-clean; };
+host_modules= { module= libtermcap; no_install=true; no_check=true; };
 host_modules= { module= utils; no_check=true; };
 host_modules= { module= gnattools; };
 host_modules= { module= lto-plugin; bootstrap=true;
@@ -135,11 +131,7 @@ target_modules = { module= libquadmath; };
 target_modules = { module= libgfortran; };
 target_modules = { module= libobjc; };
 target_modules = { module= libgo; };
-target_modules = { module= libtermcap; no_check=true;
-                   missing=mostlyclean;
-                   missing=clean;
-                   missing=distclean;
-                   missing=maintainer-clean; };
+target_modules = { module= libtermcap; no_check=true; };
 target_modules = { module= winsup; };
 target_modules = { module= libgloss; no_check=true; };
 target_modules = { module= libffi; no_install=true; };
diff --git a/Makefile.in b/Makefile.in
index 1472dd8..c47c3db 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29148,13 +29148,7 @@ maybe-install-libtermcap:
 @if libtermcap
 maybe-install-libtermcap: install-libtermcap
 
-install-libtermcap: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/libtermcap && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
+install-libtermcap:
 
 @endif libtermcap
 
@@ -29163,13 +29157,7 @@ maybe-install-strip-libtermcap:
 @if libtermcap
 maybe-install-strip-libtermcap: install-strip-libtermcap
 
-install-strip-libtermcap: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/libtermcap && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+install-strip-libtermcap:
 
 @endif libtermcap
 
@@ -29417,8 +29405,23 @@ maybe-mostlyclean-libtermcap:
 @if libtermcap
 maybe-mostlyclean-libtermcap: mostlyclean-libtermcap
 
-# libtermcap doesn't support mostlyclean.
-mostlyclean-libtermcap:
+mostlyclean-libtermcap: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libtermcap/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in libtermcap" ; \
+	(cd $(HOST_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
 
 @endif libtermcap
 
@@ -29427,8 +29430,23 @@ maybe-clean-libtermcap:
 @if libtermcap
 maybe-clean-libtermcap: clean-libtermcap
 
-# libtermcap doesn't support clean.
-clean-libtermcap:
+clean-libtermcap: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libtermcap/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in libtermcap" ; \
+	(cd $(HOST_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
 
 @endif libtermcap
 
@@ -29437,8 +29455,23 @@ maybe-distclean-libtermcap:
 @if libtermcap
 maybe-distclean-libtermcap: distclean-libtermcap
 
-# libtermcap doesn't support distclean.
-distclean-libtermcap:
+distclean-libtermcap: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libtermcap/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in libtermcap" ; \
+	(cd $(HOST_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
 
 @endif libtermcap
 
@@ -29447,8 +29480,23 @@ maybe-maintainer-clean-libtermcap:
 @if libtermcap
 maybe-maintainer-clean-libtermcap: maintainer-clean-libtermcap
 
-# libtermcap doesn't support maintainer-clean.
-maintainer-clean-libtermcap:
+maintainer-clean-libtermcap: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libtermcap/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in libtermcap" ; \
+	(cd $(HOST_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
 
 @endif libtermcap
 
@@ -39113,8 +39161,23 @@ maybe-mostlyclean-target-libtermcap:
 @if target-libtermcap
 maybe-mostlyclean-target-libtermcap: mostlyclean-target-libtermcap
 
-# libtermcap doesn't support mostlyclean.
-mostlyclean-target-libtermcap:
+mostlyclean-target-libtermcap: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libtermcap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           mostlyclean) \
+	  || exit 1
 
 @endif target-libtermcap
 
@@ -39123,8 +39186,23 @@ maybe-clean-target-libtermcap:
 @if target-libtermcap
 maybe-clean-target-libtermcap: clean-target-libtermcap
 
-# libtermcap doesn't support clean.
-clean-target-libtermcap:
+clean-target-libtermcap: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing clean in $(TARGET_SUBDIR)/libtermcap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           clean) \
+	  || exit 1
 
 @endif target-libtermcap
 
@@ -39133,8 +39211,23 @@ maybe-distclean-target-libtermcap:
 @if target-libtermcap
 maybe-distclean-target-libtermcap: distclean-target-libtermcap
 
-# libtermcap doesn't support distclean.
-distclean-target-libtermcap:
+distclean-target-libtermcap: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing distclean in $(TARGET_SUBDIR)/libtermcap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           distclean) \
+	  || exit 1
 
 @endif target-libtermcap
 
@@ -39143,8 +39236,23 @@ maybe-maintainer-clean-target-libtermcap:
 @if target-libtermcap
 maybe-maintainer-clean-target-libtermcap: maintainer-clean-target-libtermcap
 
-# libtermcap doesn't support maintainer-clean.
-maintainer-clean-target-libtermcap:
+maintainer-clean-target-libtermcap: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libtermcap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           maintainer-clean) \
+	  || exit 1
 
 @endif target-libtermcap
 
diff --git a/configure b/configure
index 2f63789..e815091 100755
--- a/configure
+++ b/configure
@@ -2755,7 +2755,7 @@ build_tools="build-texinfo build-flex build-bison build-m4 build-fixincludes"
 
 # these libraries are used by various programs built for the host environment
 #
-host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktrace libcpp libdecnumber gmp mpfr mpc isl cloog libelf libiconv"
+host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libtermcap libbacktrace libcpp libdecnumber gmp mpfr mpc isl cloog libelf libiconv"
 
 # these tools are built for the host environment
 # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
@@ -3021,13 +3021,6 @@ $as_echo "$as_me: WARNING: neither ld nor gold are enabled" >&2;}
     ;;
 esac
 
-# Configure extra directories which are host specific
-
-case "${host}" in
-  *-cygwin*)
-    configdirs="$configdirs libtermcap" ;;
-esac
-
 # A target can indicate whether a language isn't supported for some reason.
 # Only spaces may be used in this macro; not newlines or tabs.
 unsupported_languages=
@@ -3717,7 +3710,7 @@ case "${target}" in
     target_configdirs="$target_configdirs target-winsup"
     ;;
   *-*-cygwin*)
-    target_configdirs="$target_configdirs target-libtermcap target-winsup"
+    target_configdirs="$target_configdirs target-winsup"
     noconfigdirs="$noconfigdirs target-libgloss"
     # always build newlib if winsup directory is present.
     if test -d "$srcdir/winsup/cygwin"; then
diff --git a/configure.ac b/configure.ac
index 315209f..21c6dd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,7 +133,7 @@ build_tools="build-texinfo build-flex build-bison build-m4 build-fixincludes"
 
 # these libraries are used by various programs built for the host environment
 #
-host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktrace libcpp libdecnumber gmp mpfr mpc isl cloog libelf libiconv"
+host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libtermcap libbacktrace libcpp libdecnumber gmp mpfr mpc isl cloog libelf libiconv"
 
 # these tools are built for the host environment
 # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
@@ -374,13 +374,6 @@ case "${ENABLE_LD}" in
     ;;
 esac
 
-# Configure extra directories which are host specific
-
-case "${host}" in
-  *-cygwin*)
-    configdirs="$configdirs libtermcap" ;;
-esac
-
 # A target can indicate whether a language isn't supported for some reason.
 # Only spaces may be used in this macro; not newlines or tabs.
 unsupported_languages=
@@ -1041,7 +1034,7 @@ case "${target}" in
     target_configdirs="$target_configdirs target-winsup"
     ;;
   *-*-cygwin*)
-    target_configdirs="$target_configdirs target-libtermcap target-winsup"
+    target_configdirs="$target_configdirs target-winsup"
     noconfigdirs="$noconfigdirs target-libgloss"
     # always build newlib if winsup directory is present.
     if test -d "$srcdir/winsup/cygwin"; then
diff --git a/gdb/configure b/gdb/configure
index 9632f9a..510ec85 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -7179,11 +7179,6 @@ fi
 # have a seperate termcap library, or no curses library at all.
 
 case $host_os in
-  cygwin*)
-    if test -d $srcdir/libtermcap; then
-      LIBS="../libtermcap/libtermcap.a $LIBS"
-      ac_cv_search_tgetent="../libtermcap/libtermcap.a"
-    fi ;;
   go32* | *djgpp*)
     ac_cv_search_tgetent="none required"
     ;;
@@ -7253,7 +7248,12 @@ fi
 
 
 if test "$ac_cv_search_tgetent" = no; then
-  as_fn_error "no termcap library found" "$LINENO" 5
+  if test -d $srcdir/../libtermcap; then
+    LIBS="../libtermcap/libtermcap.a $LIBS"
+    ac_cv_search_tgetent="../libtermcap/libtermcap.a"
+  else
+    as_fn_error "no termcap library found" "$LINENO" 5
+  fi
 fi
 
 
diff --git a/gdb/configure.ac b/gdb/configure.ac
index dfc6947..4c03f0f 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -602,11 +602,6 @@ fi
 # have a seperate termcap library, or no curses library at all.
 
 case $host_os in
-  cygwin*)
-    if test -d $srcdir/libtermcap; then
-      LIBS="../libtermcap/libtermcap.a $LIBS"
-      ac_cv_search_tgetent="../libtermcap/libtermcap.a"
-    fi ;;
   go32* | *djgpp*)
     ac_cv_search_tgetent="none required"
     ;;
@@ -621,7 +616,12 @@ esac
 AC_SEARCH_LIBS(tgetent, [termcap tinfo curses ncurses])
 
 if test "$ac_cv_search_tgetent" = no; then
-  AC_MSG_ERROR([no termcap library found])
+  if test -d $srcdir/../libtermcap; then
+    LIBS="../libtermcap/libtermcap.a $LIBS"
+    ac_cv_search_tgetent="../libtermcap/libtermcap.a"
+  else
+    AC_MSG_ERROR([no termcap library found])
+  fi
 fi
 
 AC_ARG_WITH([system-readline],