diff --git a/tools/configure b/tools/configure
index 1bf72f8..e2313d5 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/genlang b/tools/genlang
index f4eb698..9f9e904 100755
--- a/tools/genlang
+++ b/tools/genlang
@@ -89,29 +89,29 @@ my $voiceout = $o;
 my $check = ($binary?1:0) + ($prefix?1:0) + ($update?1:0) + ($voiceout?1:0) + ($sortfile?1:0);
 
 if($check > 1) {
-    print "Please use only one of -p, -u, -o, -b and -s\n";
+    print STDERR "Please use only one of -p, -u, -o, -b and -s\n";
     exit;
 }
 if(!$check) {
-    print "Please use at least one of -p, -u, -o, -b and -s\n";
+    print STDERR "Please use at least one of -p, -u, -o, -b and -s\n";
     exit;
 }
 
 
 if(($binary || $update || $voiceout || $sortfile) && !$english) {
-    print "Please use -e too when you use -b, -o, -u or -s\n";
+    print STDERR "Please use -e too when you use -b, -o, -u or -s\n";
     exit;
 }
 
 my $target_id = $i;
 if($binary && !$target_id) {
-    print "Please specify a target id number (with -i)!\n";
+    print STDERR "Please specify a target id number (with -i)!\n";
     exit;
 }
 
 my $target = $t;
 if(!$target && !$update && !$sortfile) {
-    print "Please specify a target (with -t)!\n";
+    print STDERR "Please specify a target (with -t)!\n";
     exit;
 }
 my $verbose=$v;
@@ -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/svnversion.sh b/tools/svnversion.sh
index 8fe9804..8d75c8b 100755
--- a/tools/svnversion.sh
+++ b/tools/svnversion.sh
@@ -13,33 +13,37 @@
 # Prints the revision "rXYZ" of the first argument, as reported by svnversion.
 # Prints "unknown" if svnversion fails or says "exported".
 svnversion_safe() {
-    # LANG=C forces svnversion to not localize "exported".
-    if OUTPUT=`LANG=C svnversion "$@"`; then
-        if [ "$OUTPUT" = "exported" ]; then
+    if [ -z `which svnversion` ]; then
+        echo "unknown"
+    else
+        # LANG=C forces svnversion to not localize "exported".
+        if OUTPUT=`LANG=C svnversion "$@"`; then
+            if [ "$OUTPUT" = "exported" ]; then
 
-            # Not a SVN repository, maybe a git-svn one ?
-            if [ -z "$1" ]; then
-                GITDIR="./.git"
-            else
-                GITDIR="$1/.git"
-            fi
+                # Not a SVN repository, maybe a git-svn one ?
+                if [ -z "$1" ]; then
+                    GITDIR="./.git"
+                else
+                    GITDIR="$1/.git"
+                fi
 
-            # First make sure it is a git repository
-            if [ -d "$GITDIR" ]; then
-                OUTPUT=`LANG=C git --git-dir="$GITDIR" svn info 2>/dev/null|grep '^Revision: '|cut -d\  -f2`
-                if [ -z "$OUTPUT" ]; then
+                # First make sure it is a git repository
+                if [ -d "$GITDIR" ]; then
+                    OUTPUT=`LANG=C git --git-dir="$GITDIR" svn info 2>/dev/null|grep '^Revision: '|cut -d\  -f2`
+                    if [ -z "$OUTPUT" ]; then
+                        echo "unknown"
+                    else
+                        echo "r$OUTPUT"
+                    fi
+                else # not a git repository
                     echo "unknown"
-                else
-                    echo "r$OUTPUT"
                 fi
-            else # not a git repository
-                echo "unknown"
+            else
+                echo "r$OUTPUT"
             fi
         else
-            echo "r$OUTPUT"
+            echo "unknown"
         fi
-    else
-        echo "unknown"
     fi
 }