diff --git a/ChangeLog b/ChangeLog
index f22c6744..8624957d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-03  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
+
+	* config/ltmain.in: Change $XSED to $Xsed to fix hang noticed
+	under MinGW.
+	* tests/defs.in: Support VERBOSE=debug to enable shell tracing
+	while running tests.
+
 2004-10-03  Gary V. Vaughan  <gary@gnu.org>
 
 	* libltdl/lt__alloc.h (lt__alloc_die): Declare with LT_SCOPE as
diff --git a/config/ltmain.in b/config/ltmain.in
index e6f2d8ea..334ad498 100644
--- a/config/ltmain.in
+++ b/config/ltmain.in
@@ -1926,7 +1926,7 @@ func_mode_install ()
 	# Do a test to see if this is really a libtool program.
 	case $host in
 	*cygwin*|*mingw*)
-	    wrapper=`$ECHO "X$file" | $XSED -e 's,.exe$,,'`
+	    wrapper=`$ECHO "X$file" | $Xsed -e 's,.exe$,,'`
 	    ;;
 	*)
 	    wrapper=$file
diff --git a/tests/defs.in b/tests/defs.in
index ed86c426..b68974a8 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -43,12 +43,17 @@ if test -z "$DJGPP"; then
     CONFIG_SITE=/nonexistent
 fi
 
-# See how redirections should work.
+# How verbose should we be?  Default is no test output.
+# Setting VERBOSE=yes enables test output.
+# Setting VERBOSE=debug also puts the shell in debug mode.
 test "${VERBOSE+set}" != "set" && VERBOSE=no
 case "$VERBOSE" in
 NO | no | 0 | "")
   exec > /dev/null 2>&1
   ;;
+DEBUG | debug )
+  set -x
+  ;;
 esac
 
 if test -z "$srcdir"; then