diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make
old mode 100644
new mode 100755
index a8c0085..53115a1
--- a/apps/codecs/codecs.make
+++ b/apps/codecs/codecs.make
@@ -9,7 +9,7 @@
 
 CODECDIR = $(BUILDDIR)/apps/codecs
 CODECS_SRC := $(call preprocess, $(APPSDIR)/codecs/SOURCES)
-OTHER_SRC += $(CODECS_SRC)
+CODEC_SRC += $(CODECS_SRC)
 
 CODECS := $(CODECS_SRC:.c=.codec)
 CODECS := $(subst $(ROOTDIR),$(BUILDDIR),$(CODECS))
diff --git a/apps/codecs/demac/libdemac.make b/apps/codecs/demac/libdemac.make
old mode 100644
new mode 100755
index 5026fb1..7275b85
--- a/apps/codecs/demac/libdemac.make
+++ b/apps/codecs/demac/libdemac.make
@@ -11,7 +11,7 @@
 DEMACLIB := $(CODECDIR)/libdemac.a
 DEMACLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/demac/libdemac/SOURCES)
 DEMACLIB_OBJ := $(call c2obj, $(DEMACLIB_SRC))
-OTHER_SRC += $(DEMACLIB_SRC)
+CODEC_SRC += $(DEMACLIB_SRC)
 
 $(DEMACLIB): $(DEMACLIB_OBJ)
 	$(SILENT)$(shell rm -f $@)
diff --git a/apps/codecs/lib/libcodec.make b/apps/codecs/lib/libcodec.make
old mode 100644
new mode 100755
index d784b7c..211654b
--- a/apps/codecs/lib/libcodec.make
+++ b/apps/codecs/lib/libcodec.make
@@ -10,7 +10,7 @@
 CODECLIB := $(CODECDIR)/libcodec.a
 CODECLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/lib/SOURCES)
 CODECLIB_OBJ := $(call c2obj, $(CODECLIB_SRC))
-OTHER_SRC += $(CODECLIB_SRC)
+CODEC_SRC += $(CODECLIB_SRC)
 
 $(CODECLIB): $(CODECLIB_OBJ)
 	$(SILENT)$(shell rm -f $@)
diff --git a/apps/codecs/liba52/liba52.make b/apps/codecs/liba52/liba52.make
old mode 100644
new mode 100755
index 79b2eb2..a8ec58a
--- a/apps/codecs/liba52/liba52.make
+++ b/apps/codecs/liba52/liba52.make
@@ -11,7 +11,7 @@
 A52LIB := $(CODECDIR)/liba52.a
 A52LIB_SRC := $(call preprocess, $(APPSDIR)/codecs/liba52/SOURCES)
 A52LIB_OBJ := $(call c2obj, $(A52LIB_SRC))
-OTHER_SRC += $(A52LIB_SRC)
+CODEC_SRC += $(A52LIB_SRC)
 
 $(A52LIB): $(A52LIB_OBJ)
 	$(SILENT)$(shell rm -f $@)
diff --git a/apps/codecs/libalac/libalac.make b/apps/codecs/libalac/libalac.make
old mode 100644
new mode 100755
index b23050f..3074fee
--- a/apps/codecs/libalac/libalac.make
+++ b/apps/codecs/libalac/libalac.make
@@ -11,7 +11,7 @@
 ALACLIB := $(CODECDIR)/libalac.a
 ALACLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libalac/SOURCES)
 ALACLIB_OBJ := $(call c2obj, $(ALACLIB_SRC))
-OTHER_SRC += $(ALACLIB_SRC)
+CODEC_SRC += $(ALACLIB_SRC)
 
 $(ALACLIB): $(ALACLIB_OBJ)
 	$(SILENT)$(shell rm -f $@)
diff --git a/apps/codecs/libasap/libasap.make b/apps/codecs/libasap/libasap.make
old mode 100644
new mode 100755
index 8054648..59afaae
--- a/apps/codecs/libasap/libasap.make
+++ b/apps/codecs/libasap/libasap.make
@@ -11,7 +11,7 @@
 ASAPLIB := $(CODECDIR)/libasap.a
 ASAPLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libasap/SOURCES)
 ASAPLIB_OBJ := $(call c2obj, $(ASAPLIB_SRC))
-OTHER_SRC += $(ASAPLIB_SRC)
+CODEC_SRC += $(ASAPLIB_SRC)
 
 $(ASAPLIB): $(ASAPLIB_OBJ)
 	$(SILENT)$(shell rm -f $@)
diff --git a/apps/codecs/libcook/libcook.make b/apps/codecs/libcook/libcook.make
old mode 100644
new mode 100755
index 0783691..0332010
--- a/apps/codecs/libcook/libcook.make
+++ b/apps/codecs/libcook/libcook.make
@@ -11,7 +11,7 @@
 COOKLIB := $(CODECDIR)/libcook.a
 COOKLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libcook/SOURCES)
 COOKLIB_OBJ := $(call c2obj, $(COOKLIB_SRC))
-OTHER_SRC += $(COOKLIB_SRC)
+CODEC_SRC += $(COOKLIB_SRC)
 
 $(COOKLIB): $(COOKLIB_OBJ)
 	$(SILENT)$(shell rm -f $@)
diff --git a/apps/codecs/libfaad/libfaad.make b/apps/codecs/libfaad/libfaad.make
old mode 100644
new mode 100755
index 4f5fbc3..353e9b1
--- a/apps/codecs/libfaad/libfaad.make
+++ b/apps/codecs/libfaad/libfaad.make
@@ -11,7 +11,7 @@
 FAADLIB := $(CODECDIR)/libfaad.a
 FAADLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libfaad/SOURCES)
 FAADLIB_OBJ := $(call c2obj, $(FAADLIB_SRC))
-OTHER_SRC += $(FAADLIB_SRC)
+CODEC_SRC += $(FAADLIB_SRC)
 OTHER_INC += -I$(APPSDIR)/codecs/libfaad
 
 $(FAADLIB): $(FAADLIB_OBJ)
diff --git a/apps/codecs/libffmpegFLAC/libffmpegFLAC.make b/apps/codecs/libffmpegFLAC/libffmpegFLAC.make
old mode 100644
new mode 100755
index 734f3d2..eedf0a3
--- a/apps/codecs/libffmpegFLAC/libffmpegFLAC.make
+++ b/apps/codecs/libffmpegFLAC/libffmpegFLAC.make
@@ -11,7 +11,7 @@
 FFMPEGFLACLIB := $(CODECDIR)/libffmpegFLAC.a
 FFMPEGFLACLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libffmpegFLAC/SOURCES)
 FFMPEGFLACLIB_OBJ := $(call c2obj, $(FFMPEGFLACLIB_SRC))
-OTHER_SRC += $(FFMPEGFLACLIB_SRC)
+CODEC_SRC += $(FFMPEGFLACLIB_SRC)
 
 $(FFMPEGFLACLIB): $(FFMPEGFLACLIB_OBJ)
 	$(SILENT)$(shell rm -f $@)
diff --git a/apps/codecs/libm4a/libm4a.make b/apps/codecs/libm4a/libm4a.make
old mode 100644
new mode 100755
index 8b11fce..a59c308
--- a/apps/codecs/libm4a/libm4a.make
+++ b/apps/codecs/libm4a/libm4a.make
@@ -11,7 +11,7 @@
 M4ALIB := $(CODECDIR)/libm4a.a
 M4ALIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libm4a/SOURCES)
 M4ALIB_OBJ := $(call c2obj, $(M4ALIB_SRC))
-OTHER_SRC += $(M4ALIB_SRC)
+CODEC_SRC += $(M4ALIB_SRC)
 
 $(M4ALIB): $(M4ALIB_OBJ)
 	$(SILENT)$(shell rm -f $@)
diff --git a/apps/codecs/libmad/libmad.make b/apps/codecs/libmad/libmad.make
old mode 100644
new mode 100755
index c5b197e..8772f4a
--- a/apps/codecs/libmad/libmad.make
+++ b/apps/codecs/libmad/libmad.make
@@ -18,7 +18,7 @@ MPEGMADFLAGS = $(MADFLAGS) -DMPEGPLAYER
 MADLIB := $(CODECDIR)/libmad.a
 MADLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libmad/SOURCES)
 MADLIB_OBJ := $(call c2obj, $(MADLIB_SRC))
-OTHER_SRC += $(MADLIB_SRC)
+CODEC_SRC += $(MADLIB_SRC)
 
 $(MADLIB): $(MADLIB_OBJ)
 	$(SILENT)$(shell rm -f $@)
diff --git a/apps/codecs/libmusepack/libmusepack.make b/apps/codecs/libmusepack/libmusepack.make
old mode 100644
new mode 100755
index e975f00..76f9f57
--- a/apps/codecs/libmusepack/libmusepack.make
+++ b/apps/codecs/libmusepack/libmusepack.make
@@ -11,7 +11,7 @@
 MUSEPACKLIB := $(CODECDIR)/libmusepack.a
 MUSEPACKLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libmusepack/SOURCES)
 MUSEPACKLIB_OBJ := $(call c2obj, $(MUSEPACKLIB_SRC))
-OTHER_SRC += $(MUSEPACKLIB_SRC)
+CODEC_SRC += $(MUSEPACKLIB_SRC)
 
 $(MUSEPACKLIB): $(MUSEPACKLIB_OBJ)
 	$(SILENT)$(shell rm -f $@)
diff --git a/apps/codecs/libspc/libspc.make b/apps/codecs/libspc/libspc.make
old mode 100644
new mode 100755
index 7da5135..1c2d78e
--- a/apps/codecs/libspc/libspc.make
+++ b/apps/codecs/libspc/libspc.make
@@ -11,7 +11,7 @@
 SPCLIB := $(CODECDIR)/libspc.a
 SPCLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libspc/SOURCES)
 SPCLIB_OBJ := $(call c2obj, $(SPCLIB_SRC))
-OTHER_SRC += $(SPCLIB_SRC)
+CODEC_SRC += $(SPCLIB_SRC)
 
 $(SPCLIB): $(SPCLIB_OBJ)
 	$(SILENT)$(shell rm -f $@)
diff --git a/apps/codecs/libspeex/libspeex.make b/apps/codecs/libspeex/libspeex.make
old mode 100644
new mode 100755
index dcf5b8b..48237bc
--- a/apps/codecs/libspeex/libspeex.make
+++ b/apps/codecs/libspeex/libspeex.make
@@ -28,7 +28,7 @@ VOICESPEEXFLAGS = $(filter-out -ffunction-sections, $(filter-out -DCODEC,$(SPEEX
 SPEEXLIB := $(CODECDIR)/libspeex.a
 SPEEXLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libspeex/SOURCES)
 SPEEXLIB_OBJ := $(call c2obj, $(SPEEXLIB_SRC))
-OTHER_SRC += $(SPEEXLIB_SRC)
+CODEC_SRC += $(SPEEXLIB_SRC)
 
 $(SPEEXLIB): $(SPEEXLIB_OBJ)
 	$(SILENT)$(shell rm -f $@)
diff --git a/apps/codecs/libtremor/libtremor.make b/apps/codecs/libtremor/libtremor.make
old mode 100644
new mode 100755
index 1bd1b20..952f1cf
--- a/apps/codecs/libtremor/libtremor.make
+++ b/apps/codecs/libtremor/libtremor.make
@@ -11,7 +11,7 @@
 TREMORLIB := $(CODECDIR)/libtremor.a
 TREMORLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libtremor/SOURCES)
 TREMORLIB_OBJ := $(call c2obj, $(TREMORLIB_SRC))
-OTHER_SRC += $(TREMORLIB_SRC)
+CODEC_SRC += $(TREMORLIB_SRC)
 
 $(TREMORLIB): $(TREMORLIB_OBJ)
 	$(SILENT)$(shell rm -f $@)
diff --git a/apps/codecs/libwavpack/libwavpack.make b/apps/codecs/libwavpack/libwavpack.make
old mode 100644
new mode 100755
index a2e5377..e24bf08
--- a/apps/codecs/libwavpack/libwavpack.make
+++ b/apps/codecs/libwavpack/libwavpack.make
@@ -11,7 +11,7 @@
 WAVPACKLIB := $(CODECDIR)/libwavpack.a
 WAVPACKLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libwavpack/SOURCES)
 WAVPACKLIB_OBJ := $(call c2obj, $(WAVPACKLIB_SRC))
-OTHER_SRC += $(WAVPACKLIB_SRC)
+CODEC_SRC += $(WAVPACKLIB_SRC)
 
 $(WAVPACKLIB): $(WAVPACKLIB_OBJ)
 	$(SILENT)$(shell rm -f $@)
diff --git a/apps/codecs/libwma/libwma.make b/apps/codecs/libwma/libwma.make
old mode 100644
new mode 100755
index 71c4cdc..168c29b
--- a/apps/codecs/libwma/libwma.make
+++ b/apps/codecs/libwma/libwma.make
@@ -11,7 +11,7 @@
 WMALIB := $(CODECDIR)/libwma.a
 WMALIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libwma/SOURCES)
 WMALIB_OBJ := $(call c2obj, $(WMALIB_SRC))
-OTHER_SRC += $(WMALIB_SRC)
+CODEC_SRC += $(WMALIB_SRC)
 
 $(WMALIB): $(WMALIB_OBJ)
 	$(SILENT)$(shell rm -f $@)
diff --git a/tools/addtargetdir.pl b/tools/addtargetdir.pl
index 6a9a72a..7e74501 100755
--- a/tools/addtargetdir.pl
+++ b/tools/addtargetdir.pl
@@ -22,6 +22,10 @@ my $src;
 
 # Split the input file on any runs of '\' and whitespace.
 for (split(/[\s\\]+/m, <STDIN>)) {
+    # When MinGW environment, $_ is <drive letter>:\<MinGW root dir>\$rbroot\... .
+    if (/$rbroot/) {
+        s/.+$rbroot/$rbroot/;
+    }
     /^(\/)?[^:]+(\:)?$/;
 # Save target and continue if this item ends in ':'
     if (!($2 && ($target=$&))) {
@@ -34,7 +38,9 @@ for (split(/[\s\\]+/m, <STDIN>)) {
             $target = "";
 # Otherwise, check for an incomplete path for the source file
         } elsif (!$1) {
-            $src = "$builddir/$src";
+            if (!($src =~ /$rbroot/)) {
+                $src = "$builddir/$src";
+            }
         }
         print " \\\n  $src";
     }
diff --git a/tools/root.make b/tools/root.make
index 8a92398..327972d 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -95,6 +95,7 @@ $(DEPFILE) dep:
 	$(call PRINTS,Generating dependencies)
 	@echo foo > /dev/null # there must be a "real" command in the rule
 	$(call mkdepfile,$(DEPFILE),$(SRC))
+	$(call mkdepfile,$(DEPFILE),$(CODEC_SRC))
 	$(call mkdepfile,$(DEPFILE),$(OTHER_SRC))
 	$(call mkdepfile,$(DEPFILE),$(ASMDEFS_SRC))
 	@mv $(DEPFILE)_ $(DEPFILE)
@@ -108,7 +109,10 @@ tools: $(TOOLS)
 -include $(DEPFILE)
 
 veryclean: clean
-	$(SILENT)rm -rf $(TOOLS)
+	$(SILENT)case `uname` in \
+	  MINGW*) rm -rf $(TOOLS:=.exe) ;; \
+	  *)      rm -rf $(TOOLS) ;; \
+	esac
 
 clean:
 	$(SILENT)echo Cleaning build directory
@@ -218,7 +222,7 @@ voicetools:
 
 tags:
 	$(SILENT)rm -f TAGS
-	$(SILENT)etags -o $(BUILDDIR)/TAGS $(filter-out %.o,$(SRC) $(OTHER_SRC))
+	$(SILENT)etags -o $(BUILDDIR)/TAGS $(filter-out %.o,$(SRC) $(CODEC_SRC) $(OTHER_SRC))
 
 fontzip:
 	$(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 1 -o rockbox-fonts.zip $(TARGET) $(BINARY)