diff --git a/build-mingw b/build-mingw
index 4ad3844d..2dfe323f 100755
--- a/build-mingw
+++ b/build-mingw
@@ -57,7 +57,14 @@ LOL_LIBS="$LOL_LIBS -lSDL_image -lSDL_mixer -lSDLmain -lSDL -lopengl32 -lglew32"
# Bootstrap, configure and make
./bootstrap
-./configure CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" \
+# Only on Windows
+if test "x${MSYSTEM}" != xMINGW32; then
+ HOSTFLAGS=--host=i586-mingw32msvc
+ BUILDFLAGS=--build=none
+fi
+
+./configure $HOSTFLAGS $BUILDFLAGS \
+ CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" \
GTK_LIBS="$GTK_LIBS" LOL_LIBS="$LOL_LIBS"
make
diff --git a/build/bitten.xml b/build/bitten.xml
index cfc91d67..64caf983 100644
--- a/build/bitten.xml
+++ b/build/bitten.xml
@@ -8,33 +8,82 @@
-