diff --git a/ChangeLog b/ChangeLog
index a7af04df19c..9552a16d862 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-24  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.def: Add dependency from termcap to gdb.
+	* Makefile.in: Regenerate.
+
 2011-03-24  Paolo Bonzini  <bonzini@gnu.org>
 
 	* configure.ac: Remove all mentions of mh-sysv4 and mh-solaris.
diff --git a/Makefile.def b/Makefile.def
index 36827813d96..0e63ad39286 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -387,6 +387,7 @@ dependencies = { module=all-gdb; on=all-build-bison; };
 dependencies = { module=all-gdb; on=all-build-byacc; };
 dependencies = { module=all-gdb; on=all-sim; };
 dependencies = { module=all-gdb; on=all-libdecnumber; };
+dependencies = { module=all-gdb; on=all-libtermcap; };
 
 dependencies = { module=configure-libgui; on=configure-tcl; };
 dependencies = { module=configure-libgui; on=configure-tk; };
diff --git a/Makefile.in b/Makefile.in
index 2dfc3e577be..fa1c1448f8d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -60576,6 +60576,7 @@ all-gdb: maybe-all-build-bison
 all-gdb: maybe-all-build-byacc
 all-gdb: maybe-all-sim
 all-gdb: maybe-all-libdecnumber
+all-gdb: maybe-all-libtermcap
 configure-libgui: maybe-configure-tcl
 configure-libgui: maybe-configure-tk
 all-libgui: maybe-all-tcl
diff --git a/config/ChangeLog b/config/ChangeLog
index d45cf25f0d4..47baee84309 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-24  Paolo Bonzini  <bonzini@gnu.org>
+
+	* mh-cygwin: Remove obsolete variables and dependencies.
+
 2011-03-24  Paolo Bonzini  <bonzini@gnu.org>
 
 	* mh-sysv4: Remove.
diff --git a/config/mh-cygwin b/config/mh-cygwin
index e3f7325035a..1f746bdea84 100644
--- a/config/mh-cygwin
+++ b/config/mh-cygwin
@@ -1,11 +1,4 @@
-EXTRA_TARGET_HOST_ALL_MODULES=maybe-all-libtermcap
-EXTRA_TARGET_HOST_INSTALL_MODULES=maybe-install-libtermcap
-
 # Increase stack limit to a figure based on the Linux default, with 4MB added
 # as GCC turns out to need that much more to pass all the limits-* tests.
 LDFLAGS += -Wl,--stack,12582912
 BOOT_LDFLAGS += -Wl,--stack,12582912
-
-all-gdb: maybe-all-libtermcap
-
-install-gdb: maybe-all-libtermcap