diff --git a/winsup/ChangeLog b/winsup/ChangeLog
index b835a08b2..88622fe83 100644
--- a/winsup/ChangeLog
+++ b/winsup/ChangeLog
@@ -1,3 +1,9 @@
+Sun Oct  1 22:02:38 2000  Christopher Faylor <cgf@cygnus.com>
+
+	* Makefile.common: Extend VERBOSE default.
+	* Makefile.in: Don't clean the testsuite separately.  It's already part
+	of CLEAN_SUBDIRS.
+
 2000-09-30  Christopher Faylor  <cgf@cygnus.com>
 
 	* Makefile.common: Default to VERBOSE when part of overall source
diff --git a/winsup/Makefile.common b/winsup/Makefile.common
index c9cb5f1d2..38a5779d7 100644
--- a/winsup/Makefile.common
+++ b/winsup/Makefile.common
@@ -11,8 +11,8 @@
 # This makefile requires GNU make.
 
 CFLAGS_COMMON:=-Wall -Wwrite-strings # -finline-functions
-MALLOC_DEBUG:=#-DMALLOC_DEBUG -I/cygnus/src/sourceware/winsup/cygwin/dlmalloc
-MALLOC_OBJ:=#/cygnus/src/sourceware/winsup/cygwin/dlmalloc/malloc.o
+MALLOC_DEBUG:=#-DMALLOC_DEBUG -I/cygnus/src/uberbaum/winsup/cygwin/dlmalloc
+MALLOC_OBJ:=#/cygnus/src/uberbaum/winsup/cygwin/dlmalloc/malloc.o
 
 override srcdir:=${shell cd $(srcdir); pwd}
 ifneq (,${filter-out /%,$(srcdir)})
@@ -106,6 +106,10 @@ ifdef RPATH_ENVVAR
 VERBOSE=1
 endif
 
+ifneq "${findstring -B,$(COMPILE_CXX) $(COMPILE_CC)}" ""
+VERBOSE=1
+endif
+
 .PRECIOUS: %.o
 
 %.o: %.cc
diff --git a/winsup/Makefile.in b/winsup/Makefile.in
index 09376c30e..2bc1c419c 100644
--- a/winsup/Makefile.in
+++ b/winsup/Makefile.in
@@ -73,7 +73,6 @@ $(INSTALL_SUBDIRS):
 
 $(CLEAN_SUBDIRS):
 	@$(MAKE) -C ${patsubst clean_%,%,$@} clean
-	@$(MAKE) -C testsuite clean
 
 .PRECIOUS: Makefile