diff --git a/ChangeLog b/ChangeLog
index e9838fe372..a710bfae62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Dec 30 20:34:52 1998  Christopher Faylor <cgf@cygnus.com>
+
+	* configure.in: makefile stub for cygwin target is probably
+	unnecessary.  Remove it for now.
+	* config/mt-cygwin: Remove.
+
 Wed Dec 30 01:13:03 1998  Christopher Faylor <cgf@cygnus.com>
 
 	* configure.in: libtermcap.a should be built when cygwin is the
@@ -50,6 +56,34 @@ start-sanitize-java
 	(configure-target-qthreads): New target.
 
 end-sanitize-java
+Wed Dec 23 00:20:50 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* config.sub: Clean up handling of hppa2.0.
+
+Tue Dec 22 23:56:31 1998  Rodney Brown  (rodneybrown@pmsc.com)
+
+	* config.guess: Use C code to identify more HP machines.
+
+Thu Dec 17 01:22:30 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* config.sub: Handle hppa2.0.
+
+Fri Dec  4 01:34:02 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* config.guess: Improve detection of hppa2.0 processors.
+
+Fri Dec  4 01:33:05 1998  Niall Smart <nialls@euristix.ie>
+
+	* config.guess: Recognize FreeBSD using ELF automatically.
+
+1998-11-26  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* configure (skip-this-dir): Add handling for new shell script, which
+	might be created by a sub-directory's configure to indicate, this particular
+	directory is "unwanted".
+	* Makefile.in ($(CONFIGURE_TARGET_MODULES)): Likewise.
+
+
 start-sanitize-vr4xxx
 1998-11-24  Gavin Romig-Koch  <gavin@cygnus.com>
 
diff --git a/Makefile.in b/Makefile.in
index 81c89d8ed3..8f1d28a28a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -171,7 +171,7 @@ OTHERS =
 SPECIAL_LIBS = libdsp
 # end-sanitize-dsp
 
-TARGET_CONFIGDIRS = libiberty libgloss $(SPECIAL_LIBS) newlib libio librx libstdc++ libg++ winsup opcodes libstub cygmon
+TARGET_CONFIGDIRS = libiberty libgloss $(SPECIAL_LIBS) newlib libio librx libstdc++ libg++ winsup opcodes bsp libstub cygmon
 
 # Target libraries are put under this directory:
 # Changed by configure to $(target_alias) if cross.
@@ -826,6 +826,7 @@ ALL_TARGET_MODULES = \
 	all-target-librx \
 	all-target-libg++ \
 	all-target-newlib \
+	all-target-libtermcap \
 	all-target-winsup \
 	$(start-sanitize-dsp) \
 	all-target-libdsp \
@@ -840,6 +841,7 @@ ALL_TARGET_MODULES = \
 	all-target-boehm-gc \
 	all-target-qthreads \
 	$(end-sanitize-java) \
+	all-target-bsp \
 	all-target-cygmon
 
 # This is a list of the configure targets for all of the modules which
@@ -853,6 +855,7 @@ CONFIGURE_TARGET_MODULES = \
 	configure-target-librx \
 	configure-target-libg++ \
 	configure-target-newlib \
+	configure-target-libtermcap \
 	configure-target-winsup \
 	configure-target-libgloss \
 	configure-target-libiberty \
@@ -864,6 +867,7 @@ CONFIGURE_TARGET_MODULES = \
 	configure-target-boehm-gc \
 	configure-target-qthreads \
 	$(end-sanitize-java) \
+	configure-target-bsp \
 	configure-target-cygmon
 
 # This is a list of the check targets for all of the modules which are
@@ -895,9 +899,11 @@ INSTALL_TARGET_MODULES = \
 	install-target-libstdc++ \
 	install-target-libg++ \
 	install-target-newlib \
+	install-target-libtermcap \
 	install-target-winsup \
 	install-target-libgloss \
 	install-target-libiberty \
+	install-target-bsp \
 	$(start-sanitize-java) \
 	install-target-libjava \
 	install-target-boehm-gc \
@@ -1013,6 +1019,7 @@ CLEAN_TARGET_MODULES = \
 	clean-target-boehm-gc \
 	clean-target-qthreads \
 	$(end-sanitize-java) \
+	clean-target-bsp \
 	clean-target-cygmon
 
 # All of the x11 modules that can be cleaned
@@ -1434,16 +1441,23 @@ $(CONFIGURE_TARGET_MODULES):
 	      libsrcdir="$$s/$${dir}"; \
 	    fi; \
 	    if [ -f $${libsrcdir}/configure ] ; then \
-	      rm -f no-such-file; \
+	      rm -f no-such-file skip-this-dir; \
 	      CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
 		$(CONFIG_ARGUMENTS) $${srcdiroption} \
 		--with-target-subdir="$(TARGET_SUBDIR)"; \
 	    else \
-	      rm -f no-such-file; \
+	      rm -f no-such-file skip-this-dir; \
 	      CONFIG_SITE=no-such-file $(SHELL) $$s/configure \
 		$(CONFIG_ARGUMENTS) $${srcdiroption} \
 		--with-target-subdir="$(TARGET_SUBDIR)"; \
 	    fi; \
+	    if [ -f skip-this-dir ] ; then \
+	      sh skip-this-dir; \
+	      rm -f skip-this-dir; \
+	      cd ..; rmdir $${dir} || true; \
+	    else \
+	      true; \
+	    fi; \
 	  else \
 	    true; \
 	  fi; \
@@ -1663,6 +1677,8 @@ all-bash:
 all-bfd: all-libiberty all-intl
 all-binutils: all-libiberty all-opcodes all-bfd all-flex all-bison all-byacc all-intl
 all-bison: all-texinfo
+configure-target-bsp: $(ALL_GCC)
+all-target-bsp: configure-target-bsp all-gas all-ld all-gcc
 # start-sanitize-java
 configure-target-boehm-gc: configure-target-newlib configure-target-qthreads
 all-target-boehm-gc: configure-target-boehm-gc