diff --git a/.travis.yml b/.travis.yml
index 818e49a9..f4791b10 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,11 +3,11 @@ compiler:
   - gcc
   - clang
 
-script: make USE_CODEC_VORBIS=1 USE_FREETYPE=1 CFLAGS=-DRAVENMD4
+script: ./build-test.sh
 
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -qq libgl1-mesa-dev libsdl1.2-dev libvorbis-dev libfreetype6-dev
+  - sudo apt-get install -qq libgl1-mesa-dev libsdl1.2-dev libvorbis-dev libfreetype6-dev mingw32
   
 notifications:
   irc: "irc.freenode.org#ioquake3"
diff --git a/build-test.sh b/build-test.sh
new file mode 100755
index 00000000..3e920bb8
--- /dev/null
+++ b/build-test.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+failed=0;
+
+# Default Build
+(make) || failed=1;
+
+# Test additional options
+(make USE_CODEC_VORBIS=1 USE_FREETYPE=1 CFLAGS=-DRAVENMD4) || failed=1;
+
+# Test mingw
+(exec ./cross-make-mingw.sh) || failed=1;
+
+if [ $failed -eq 1 ]; then
+  echo "Build failure.";
+else
+  echo "All builds successful.";
+fi
+
+exit $failed;
+