diff --git a/build/buildbot/config/TBITCWXBUILDBOT.xml b/build/buildbot/config/TBITCWXBUILDBOT.xml
index faf51a4b07..03908e130a 100644
--- a/build/buildbot/config/TBITCWXBUILDBOT.xml
+++ b/build/buildbot/config/TBITCWXBUILDBOT.xml
@@ -10,14 +10,50 @@
 <xi:include href="include/unix.xml"/>
 
 <build>
-    <name>Linux wxGTK trunk</name>
-    <builddir>tbitcwxbuildbot_gtk</builddir>
+    <name>MinGW x86 trunk</name>
+    <builddir>tbitcwxbuildbot_mingw_trunk</builddir>
+    <!--scheduler>daily_0600</scheduler-->
+    <steps>
+        <checkout/>
+        <configure options="--host=i586-mingw32msvc
+                            --with-cppunit-prefix=/usr/local/i586-mingw32msvc"/>
+        <compile-all/>
+    </steps>
+</build>
+
+<build>
+    <name>MinGW x86 stable</name>
+    <builddir>tbitcwxbuildbot_mingw_stable</builddir>
+    <!--scheduler>daily_0600</scheduler-->
+    <steps>
+        <checkout branch="{$STABLE_BRANCH}"/>
+        <configure options="--host=i586-mingw32msvc
+                            --with-cppunit-prefix=/usr/local/i586-mingw32msvc"/>
+        <compile-all utils="false"/>
+    </steps>
+</build>
+
+<build>
+    <name>MinGW x86_64 trunk</name>
+    <builddir>tbitcwxbuildbot_mingw64_trunk</builddir>
     <!--scheduler>trunk_quick</scheduler-->
     <steps>
         <checkout/>
-        <configure/>
+        <configure options="--host=amd64-mingw32msvc
+                            --with-cppunit-prefix=/usr/local/amd64-mingw32msvc"/>
         <compile-all/>
-        <run-tests/>
+    </steps>
+</build>
+
+<build>
+    <name>MinGW x86_64 stable</name>
+    <builddir>tbitcwxbuildbot_mingw64_stable</builddir>
+    <!--scheduler>daily_0600</scheduler-->
+    <steps>
+        <checkout branch="{$STABLE_BRANCH}"/>
+        <configure options="--host=amd64-mingw32msvc
+                            --with-cppunit-prefix=/usr/local/amd64-mingw32msvc"/>
+        <compile-all utils="false"/>
     </steps>
 </build>
 
diff --git a/build/buildbot/config/include/defs.xml b/build/buildbot/config/include/defs.xml
index c0fab9951c..5b854d5aee 100644
--- a/build/buildbot/config/include/defs.xml
+++ b/build/buildbot/config/include/defs.xml
@@ -368,7 +368,7 @@ cd tests &amp;&amp; runtests.bat
 <xsl:template name="run-tests-unix">
     <xsl:param name="options"/>
 ERR=0
-cd tests
+cd tests || exit 0
 ./test <xsl:value-of select="normalize-space($options)"/> || ERR=$?
 if [ -n "$DISPLAY" -a -x test_gui ]; then ./test_gui || ERR=$?; fi
 exit $ERR
diff --git a/build/buildbot/config/include/wx-devs.xml b/build/buildbot/config/include/wx-devs.xml
index 934308c1b7..08516d43c2 100644
--- a/build/buildbot/config/include/wx-devs.xml
+++ b/build/buildbot/config/include/wx-devs.xml
@@ -36,6 +36,7 @@
   <email id="OLS">oliver.schoenborn -at- gmail.com</email>
   <email id="PC">paulcor -at- bullseye.com</email>
   <email id="PJC">corsix -at- corsix.org</email>
+  <email id="PMO">Peter_Most -at- gmx.de</email>
   <email id="RD">robin -at- alldunn.com</email>
   <email id="RN">wxprojects -at- comcast.net</email>
   <email id="ROL">rolinsky -at- femagsoft.com</email>