--- Makefile.orig	2008-03-27 03:05:02.000000000 -0300
+++ Makefile	2008-04-19 17:23:15.000000000 -0300
@@ -431,13 +431,13 @@
 .PHONY: flash-neo-kernel-official
 flash-neo-kernel-official: stamps/openmoko-devel-tools stamps/images
 	( cd build && \
-		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/bin/dfu-util \
+		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util \
 		--device 0x1457:0x5119 -a kernel -D `ls -t ../images/openmoko/uImage-*.bin | head -1` )
 
 .PHONY: flash-neo-rootfs-official
 flash-neo-rootfs-official: stamps/openmoko-devel-tools stamps/images
 	( cd build && \
-		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/bin/dfu-util \
+		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util \
 		--device 0x1457:0x5119 -a rootfs -D `ls -t ../images/openmoko/*.jffs2 | head -1` )
 
 .PHONY: flash-neo-local
@@ -446,13 +446,13 @@
 .PHONY: flash-neo-kernel-local
 flash-neo-kernel-local: stamps/openmoko-devel-tools stamps/openmoko-devel-image
 	( cd build && \
-		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/bin/dfu-util \
+		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util \
 		--device 0x1457:0x5119 -a kernel -D `ls -t tmp/deploy/glibc/images/neo1973/uImage-*.bin | head -1` )
 
 .PHONY: flash-neo-rootfs-local
 flash-neo-rootfs-local: stamps/openmoko-devel-tools stamps/openmoko-devel-image
 	( cd build && \
-		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/bin/dfu-util \
+		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util \
 		--device 0x1457:0x5119 -a rootfs -D `ls -t tmp/deploy/glibc/images/neo1973/OpenMoko-openmoko-devel-image-*.jffs2 | head -1` )
 
 .PHONY: flash-neo-qtopia
@@ -461,13 +461,13 @@
 .PHONY: flash-neo-kernel-qtopia
 flash-neo-kernel-qtopia: stamps/openmoko-devel-tools stamps/openmoko-qtopia-image
 	( cd build && \
-		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/bin/dfu-util \
+		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util \
 		--device 0x1457:0x5119 -a kernel -D `ls -t tmp/deploy/glibc/images/neo1973/uImage-*.bin | head -1` )
 
 .PHONY: flash-neo-rootfs-qtopia
 flash-neo-rootfs-qtopia: stamps/openmoko-devel-tools stamps/openmoko-qtopia-image
 	( cd build && \
-		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/bin/dfu-util \
+		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util \
 		--device 0x1457:0x5119 -a rootfs -D `ls -t tmp/deploy/glibc/images/neo1973/OpenMoko-openmoko-qtopia-image-*.jffs2 | head -1` )
 
 .PHONY: push-openembedded