diff --git a/tools/addtargetdir.pl b/tools/addtargetdir.pl
index 2cddf8d3d4..2c08d328dc 100755
--- a/tools/addtargetdir.pl
+++ b/tools/addtargetdir.pl
@@ -21,7 +21,7 @@ for (<STDIN>) {
     if (/^([^:]+): (\S+) (.*)/) {
         my ($target, $src, $rest) = ($1, $2, $3);
         my $dir = dirname $src;
-        $dir =~ s/$rbroot//;
+        $dir =~ s/^.*$rbroot//;
         print "$builddir$dir/$target: $src $rest\n";
     }
     elsif (/^([^:]+):  \\/) {
@@ -32,7 +32,7 @@ for (<STDIN>) {
         if (/^\s+([^ ]+) (.*)/) {
             my ($src, $rest) = ($1, $2);
             my $dir = dirname $src;
-            $dir =~ s/$rbroot//;
+            $dir =~ s/^.*$rbroot//;
             print "$builddir$dir/$target2: $src $rest\n";
             $target2 = "";
         }
diff --git a/tools/configure b/tools/configure
index 3c1975d4de..9ea5f9f739 100755
--- a/tools/configure
+++ b/tools/configure
@@ -133,6 +133,16 @@ simcc () {
    output="rockboxui.exe" # use this as output binary name
    ;;
 
+   MINGW*)
+   echo "MinGW host detected"
+
+   # sdl version
+   GCCOPTS="$GCCOPTS `sdl-config --cflags`"
+   LDOPTS="`sdl-config --libs` -mconsole"
+
+   output="rockboxui.exe" # use this as output binary name
+   ;;
+
    Linux)
    echo "Linux host detected"
    if [ "0" != `sdl-config --libs |grep -c mwindows` ]; then
diff --git a/tools/functions.make b/tools/functions.make
index 97c98a1f8d..b16bce3088 100644
--- a/tools/functions.make
+++ b/tools/functions.make
@@ -39,7 +39,7 @@ mkdepfile = $(shell \
 	-e "s: pluginbitmaps/: $(BUILDDIR)/pluginbitmaps/:g" \
 	-e "s: lib/: $(APPSDIR)/plugins/lib/:g" \
 	-e "s: codeclib.h: $(APPSDIR)/codecs/lib/codeclib.h:g" \
-	> $(1)_ && mv $(1)_ $(1) )
+	>> $(1)_)
 
 # function to create .bmp dependencies
 bmpdepfile = $(shell \
diff --git a/tools/genlang b/tools/genlang
index f4eb698a8f..21cef9966b 100755
--- a/tools/genlang
+++ b/tools/genlang
@@ -540,6 +540,10 @@ if($prefix) {
     open(CFILE, ">$prefix.c") ||
         die "Error: couldn't create file $prefix.c\n";        
 
+   # get header file name
+   $headername = "$prefix.h";
+   $headername =~ s/(.*\/)*//;
+
     print HFILE <<MOO
 /* This file was automatically generated using genlang */
 /*
@@ -564,7 +568,7 @@ MOO
 /* This file was automaticly generated using genlang, the strings come
    from "$input" */
    
-#include "$prefix.h"
+#include "$headername"
 
 unsigned char *language_strings[LANG_LAST_INDEX_IN_ARRAY];
 const unsigned char language_builtin[] =
diff --git a/tools/root.make b/tools/root.make
index bdc2745fec..954e1bfee5 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -80,7 +80,9 @@ $(RBINFO): $(BUILDDIR)/$(BINARY)
 $(DEPFILE) dep:
 	$(call PRINTS,Generating dependencies)
 	@echo foo > /dev/null # there must be a "real" command in the rule
-	$(call mkdepfile,$(DEPFILE),$(SRC) $(OTHER_SRC))
+	$(call mkdepfile,$(DEPFILE),$(SRC))
+	$(call mkdepfile,$(DEPFILE),$(OTHER_SRC))
+	@mv $(DEPFILE)_ $(DEPFILE)
 	$(call bmpdepfile,$(DEPFILE),$(BMP) $(PBMP))
 
 bin: $(DEPFILE) $(TOOLS) $(BUILDDIR)/$(BINARY)