diff --git a/config/ChangeLog b/config/ChangeLog
index 0a641fc9bb57d4685fcda6fbd34a0935d3cc297a..6d9cdfcf086eecf8788fab0e253f1c1ee07eb954 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -3,6 +3,17 @@ Tue Feb  2 22:51:21 1999 Philip Blundell  <philb@gnu.org>
 	* mh-armpic: New file.  Patch from Jim Pick <jim@jimpick.com>.
 	* mt-armpic: Likewise.
 
+Mon Jan 18 19:41:08 1999  Christopher Faylor <cgf@cygnus.com>
+
+	* cygwin.mh: Activate commented out dependencies for
+	gdb: libtermcap.
+
+Wed Nov 18 20:29:46 1998  Christopher Faylor <cgf@cygnus.com>
+
+	* cygwin.mh: Add extra libtermcap target information.
+	Add commented out dependency for gdb to libtermcap for
+	future readline requirement.
+
 Mon Nov  2 15:15:33 1998  Geoffrey Noer  <noer@cygnus.com>
 
         * mh-cygwin32: delete
diff --git a/config/mh-cygwin b/config/mh-cygwin
index 29f165667a1d87578460625ce46bbc0f3332583d..241027fb8debff5a1004fc03747d92adf19e9f29 100644
--- a/config/mh-cygwin
+++ b/config/mh-cygwin
@@ -1,9 +1,6 @@
-# We don't want debugging info in Win32-hosted toolchains.
-# Accomplish this by overriding CFLAGS.
-CFLAGS=-O2
-CXXFLAGS=-O2
+EXTRA_TARGET_HOST_ALL_MODULES=all-libtermcap
+EXTRA_TARGET_HOST_INSTALL_MODULES=install-libtermcap
 
-# We also need to override LIBGCC2_DEBUG_CFLAGS so libgcc2 will be
-# built without debugging information
+all-gdb: all-libtermcap
 
-LIBGCC2_DEBUG_CFLAGS=
+install-gdb: all-libtermcap
diff --git a/config/mh-windows b/config/mh-windows
deleted file mode 100644
index a5cc5d611df05881da7c8b975d98146de56dce5f..0000000000000000000000000000000000000000
--- a/config/mh-windows
+++ /dev/null
@@ -1,16 +0,0 @@
-CC=cc
-CFLAGS=
-RANLIB=true
-AR_FLAGS=
-
-.PHONY: windows
-windows: nmake.mak
-	@echo "Don't forget to setup setvars.mak!"
-
-nmake.mak: to-be-built
-	@echo Building nmake files
-	@$(srcdir)/gdb/mswin/genmakes
-
-to-be-built:
-	@echo Recording commands
-	@$(srcdir)/gdb/mswin/recordit