diff --git a/CHANGELOG b/CHANGELOG
index ac634299e01f948e5f1051aa3c422d1c3073ccd1..96593f379eaf9e12cc35b30ec2fdf69e48375351 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,13 @@
 Changes since U-Boot 1.1.1:
 ======================================================================
 
+* Patch by Yuli Barcohen, 19 Jul 2004:
+  - Fix host tools building in Cygwin environment
+  - Fix header files search order for host tools
+
+* Patch by Tom Armistead, 19 Jul 2004:
+  Fix kgdb.S support for 74xx_75x cpu
+
 * Patch by Jon Loeliger, 15 Jul 2004:
   Fix MPC85xx I2C driver
 
diff --git a/cpu/74xx_7xx/kgdb.S b/cpu/74xx_7xx/kgdb.S
index c3132c29bcf20157e6661307740544378f9ce73d..e838513c1df1e159e353140db56398e88bb59a25 100644
--- a/cpu/74xx_7xx/kgdb.S
+++ b/cpu/74xx_7xx/kgdb.S
@@ -20,8 +20,6 @@
  * MA 02111-1307USA
  */
 
-/* note - this won't work with the 74xx cpus.  needs more work [josh] */
-
 #include <config.h>
 #include <command.h>
 #include <74xx_7xx.h>
@@ -41,12 +39,18 @@
 
 	.globl	kgdb_flush_cache_all
 kgdb_flush_cache_all:
-	lis	r3, IDC_INVALL@h
-	mtspr	DC_CST, r3
-	sync
-	lis	r3, IDC_INVALL@h
-	mtspr	IC_CST, r3
+	lis	r3,0
+	addis	r4,r0,0x0040
+kgdb_flush_loop:
+	lwz	r5,0(r3)
+	addi	r3,r3,CFG_CACHELINE_SIZE
+	cmp	0,0,r3,r4
+	bne	kgdb_flush_loop
 	SYNC
+	mfspr	r3,1008
+	ori	r3,r3,0x8800
+	mtspr	1008,r3
+	sync
 	blr
 
 	.globl	kgdb_flush_cache_range
diff --git a/tools/Makefile b/tools/Makefile
index 911543031e93ae408e0525beca8f4c36ea13a8a6..d3dcc7d86e05551b39e1aa4319f2bbc34578acee 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -96,12 +96,10 @@ endif
 #
 ifeq ($(HOSTOS),cygwin)
 SFX = .exe
-HOST_CFLAGS += -D__WIN32__
 else
 SFX =
 endif
 
-
 #
 # Include this after HOSTOS HOSTARCH check
 # so that we can act intelligently.
@@ -111,7 +109,7 @@ include $(TOPDIR)/config.mk
 #
 # Use native tools and options
 #
-CPPFLAGS   = -I../include -I.. -DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC
+CPPFLAGS   = -idirafter ../include -DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC
 CFLAGS     = $(HOST_CFLAGS) $(CPPFLAGS) -O
 AFLAGS	   = -D__ASSEMBLY__ $(CPPFLAGS)
 CC	   = $(HOSTCC)