diff --git a/build/buildbot/config/StellarWerx32.xml b/build/buildbot/config/StellarWerx32.xml
index 7761efef16..e976957be0 100644
--- a/build/buildbot/config/StellarWerx32.xml
+++ b/build/buildbot/config/StellarWerx32.xml
@@ -10,24 +10,36 @@
 <xi:include href="include/unix.xml"/>
 
 <build>
-    <name>Linux x86 wxGTK trunk STL debug</name>
-    <builddir>stellarwerx32_wxgtk_debug</builddir>
-    <scheduler>daily_0600</scheduler>
+    <name>Linux x86 wxGTK trunk STL</name>
+    <builddir>stellarwerx32_wxgtk</builddir>
+    <scheduler>trunk_quick</scheduler>
     <steps>
         <checkout/>
-        <configure options="--with-gtk --enable-debug --enable-stl --enable-std_iostreams --enable-std_string --disable-compat28"/>
+        <configure options="--enable-stl"/>
         <compile-all/>
         <run-tests/>
     </steps>
 </build>
 
 <build>
-    <name>Linux x86 wxGTK trunk STL release</name>
-    <builddir>stellarwerx32_wxgtk_release</builddir>
-    <scheduler>trunk_quick</scheduler>
+    <name>Linux x86 wx11 stable</name>
+    <builddir>stellarwerx32_wxx11</builddir>
+    <scheduler>daily_0600</scheduler>
+    <steps>
+        <checkout branch="{$STABLE_BRANCH}"/>
+        <configure options="--with-x11"/>
+        <compile-all/>
+        <run-tests/>
+    </steps>
+</build>
+
+<build>
+    <name>Linux x86 wxGTK trunk ANSI</name>
+    <builddir>stellarwerx32_wxgtk_ansi</builddir>
+    <scheduler>daily_0600</scheduler>
     <steps>
         <checkout/>
-        <configure options="--with-gtk --disable-debug --enable-stl --enable-std_iostreams --enable-std_string --disable-compat28"/>
+        <configure options="--disable-unicode"/>
         <compile-all/>
         <run-tests/>
     </steps>
diff --git a/build/buildbot/config/StellarWerx64.xml b/build/buildbot/config/StellarWerx64.xml
index db12a2100c..5253a803d9 100644
--- a/build/buildbot/config/StellarWerx64.xml
+++ b/build/buildbot/config/StellarWerx64.xml
@@ -10,49 +10,37 @@
 <xi:include href="include/unix.xml"/>
 
 <build>
-    <name>Linux x86_64 wxGTK trunk STL debug</name>
-    <builddir>stellarwerx64_wxgtk_debug</builddir>
-    <scheduler>daily_0600</scheduler>
-    <steps>
-        <checkout/>
-        <configure options="--with-gtk --enable-debug --enable-stl --enable-std_iostreams --enable-std_string --disable-compat28"/>
-        <compile-all/>
-        <run-tests/>
-    </steps>
-</build>
-
-<build>
-    <name>Linux x86_64 wxGTK trunk STL release</name>
-    <builddir>stellarwerx64_wxgtk_release</builddir>
-    <scheduler>trunk_quick</scheduler>
-    <steps>
-        <checkout/>
-        <configure options="--with-gtk --disable-debug --enable-stl --enable-std_iostreams --enable-std_string --disable-compat28"/>
-        <compile-all/>
-        <run-tests/>
-    </steps>
-</build>
-
-<build>
-    <name>Linux x86_64 wxGTK stable STL debug</name>
-    <builddir>stellarwerx64_wxgtk_stable_debug</builddir>
-    <scheduler>daily_0600</scheduler>
-    <steps>
-        <checkout branch="{$STABLE_BRANCH}"/>
-        <configure options="--with-gtk --enable-debug --enable-stl --enable-std_iostreams --enable-std_string --disable-compat24"/>
-        <compile-all utils="false"/>
-        <run-tests/>
-    </steps>
-</build>
-
-<build>
-    <name>Linux x86_64 wxGTK stable STL release</name>
-    <builddir>stellarwerx64_wxgtk_stable_release</builddir>
+    <name>Linux x86_64 wxGTK stable</name>
+    <builddir>stellarwerx64_wxgtk</builddir>
     <scheduler>stable_quick</scheduler>
     <steps>
         <checkout branch="{$STABLE_BRANCH}"/>
-        <configure options="--with-gtk --disable-debug --enable-stl --enable-std_iostreams --enable-std_string --disable-compat24"/>
-        <compile-all utils="false"/>
+        <configure/>
+        <compile-all/>
+        <run-tests/>
+    </steps>
+</build>
+
+<build>
+    <name>Linux x86_64 wx11 trunk</name>
+    <builddir>stellarwerx64_wxx11</builddir>
+    <scheduler>daily_0700</scheduler>
+    <steps>
+        <checkout/>
+        <configure options="--with-x11"/>
+        <compile-all/>
+        <run-tests/>
+    </steps>
+</build>
+
+<build>
+    <name>Linux x86_64 wxGTK stable ANSI</name>
+    <builddir>stellarwerx64_wxgtk_ansi</builddir>
+    <scheduler>daily_0700</scheduler>
+    <steps>
+        <checkout branch="{$STABLE_BRANCH}"/>
+        <configure options="--disable-unicode"/>
+        <compile-all/>
         <run-tests/>
     </steps>
 </build>
diff --git a/build/buildbot/config/brandt32.xml b/build/buildbot/config/brandt32.xml
index ef30df7ab8..8d35b61dc0 100644
--- a/build/buildbot/config/brandt32.xml
+++ b/build/buildbot/config/brandt32.xml
@@ -10,13 +10,36 @@
 <xi:include href="include/unix.xml"/>
 
 <build>
-    <name>Linux x86 wxGTK trunk static</name>
+    <name>Linux x86 wxGTK trunk</name>
     <builddir>brandt32_gtk</builddir>
-    <!--scheduler>daily_0800</scheduler-->
+    <scheduler>trunk_quick</scheduler>
     <steps>
         <checkout/>
-        <configure options="--disable-shared --enable-opengl --enable-svg
-                            --enable-aui --with-gtk=2 --enable-graphics_ctx"/>
+        <configure/>
+        <compile-all/>
+        <run-tests/>
+    </steps>
+</build>
+
+<build>
+    <name>Linux x86 wxGTK trunk static</name>
+    <builddir>brandt32_gtk_trunk_static</builddir>
+    <scheduler>daily_0600</scheduler>
+    <steps>
+        <checkout/>
+        <configure options="--disable-shared"/>
+        <compile-all/>
+        <run-tests/>
+    </steps>
+</build>
+
+<build>
+    <name>Linux x86 wxGTK stable static</name>
+    <builddir>brandt32_gtk_stable_static</builddir>
+    <scheduler>daily_0600</scheduler>
+    <steps>
+        <checkout branch="{$STABLE_BRANCH}"/>
+        <configure options="--disable-shared"/>
         <compile-all/>
         <run-tests/>
     </steps>
diff --git a/build/buildbot/config/include/csleobuild.xml b/build/buildbot/config/include/csleobuild.xml
index 0827858432..22ee37ce27 100644
--- a/build/buildbot/config/include/csleobuild.xml
+++ b/build/buildbot/config/include/csleobuild.xml
@@ -12,82 +12,7 @@
 <bot xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
      xmlns:xi="http://www.w3.org/2001/XInclude">
 
-<xi:include href="defs.xml"/>
-
-<!--
-    build - Override <build> to add a slave lock. This has the effect of
-            serialising all the builds on this machine
--->
-<xsl:template name="build">
-    <xsl:param name="content"/>
-    <build>
-        <lock>slave</lock>
-        <xsl:copy-of select="$content"/>
-    </build>
-</xsl:template>
-
-<!--
-    checkout - checks out to a shared directory
-
-    Checks out to a directory '../$branch' shared between builds. Then creates
-    a directory 'build' for this job to build in, and 'src' which is a link to
-    the shared sources. This relies on all builds for the same branch being
-    serialised with lock so that one build doesn't update the sources while
-    another is building them.
-
-    Usage typically just:
-        <checkout/>
-    for the trunk, or:
-        <checkout branch="branches/WX_2_8_BRANCH"/>
-    to checkout a branch.
--->
-<xsl:template name="checkout">
-    <xsl:param name="content"/>
-    <xsl:param name="branch" select="'trunk'"/>
-    <xsl:variable name="nodes" select="exsl:node-set($content)"/>
-    <svn>
-        <xsl:if test="not($nodes/svnurl)">
-            <xsl:if test="not($nodes/baseURL)">
-                <baseURL><SVN_URL/></baseURL>
-            </xsl:if>
-            <xsl:if test="not($nodes/defaultBranch)">
-                <defaultBranch><xsl:value-of select="$branch"/></defaultBranch>
-            </xsl:if>
-        </xsl:if>
-        <xsl:if test="not($nodes/workdir)">
-            <workdir>../<xsl:value-of select="$branch"/></workdir>
-        </xsl:if>
-        <xsl:copy-of select="$content"/>
-    </svn>
-    <shellcommand>
-        <description>creating build directory</description>
-        <descriptionDone>create build directory</descriptionDone>
-        <workdir>.</workdir>
-        <command>
-            rm -rf build &amp;&amp;
-            mkdir build &amp;&amp;
-            ln -sf ../<xsl:value-of select="$branch"/> src
-        </command>
-    </shellcommand>
-</xsl:template>
-
-<!--
-    configure - use '../src/configure' as the default configure command,
-                include disable-precomp-headers in the default options and
-                post process the Makefiles to use ccache.
-
-    Usage: <configure options="-with-foobar"/>
--->
-<xsl:template name="configure">
-    <xsl:param name="content"/>
-    <xsl:param name="options"/>
-    <configure>
-        <copy-with-defaults content="{$content}">
-            <command>../src/configure --disable-precomp-headers <xsl:value-of select="normalize-space($options)"/></command>
-        </copy-with-defaults>
-        <command>find . -name Makefile | xargs perl -pi -e 's/^(?:CC|CXX) = /$&amp;ccache /'</command>
-    </configure>
-</xsl:template>
+<xi:include href="unix.xml"/>
 
 <!--
     run-tests - build step to run the test suites.
diff --git a/build/buildbot/config/include/unix.xml b/build/buildbot/config/include/unix.xml
index f28d06a9fa..2aa1399040 100644
--- a/build/buildbot/config/include/unix.xml
+++ b/build/buildbot/config/include/unix.xml
@@ -83,7 +83,7 @@
     <xsl:param name="options"/>
     <configure>
         <copy-with-defaults content="{$content}">
-            <command>../src/configure --disable-precomp-headers <xsl:value-of select="normalize-space($options)"/></command>
+            <command>../src/configure <xsl:value-of select="normalize-space($options)"/> --disable-precomp-headers --disable-compat28 --disable-compat26</command>
         </copy-with-defaults>
         <command>find . -name Makefile | xargs perl -pi -e 's/^(?:CC|CXX) = /$&amp;ccache /'</command>
     </configure>
diff --git a/build/buildbot/config/ravnsgaard.xml b/build/buildbot/config/ravnsgaard.xml
index fa7b0cd5a7..e46bf71774 100644
--- a/build/buildbot/config/ravnsgaard.xml
+++ b/build/buildbot/config/ravnsgaard.xml
@@ -9,50 +9,14 @@
     <xi:include href="include/unix.xml"/>
 
     <build>
-        <name>Linux i386 wxGTK trunk STL debug</name>
-        <builddir>ravnsgaard_wxgtk_debug</builddir>
-        <scheduler>daily_0600</scheduler>
-        <steps>
-            <checkout/>
-            <configure options="--with-gtk --enable-debug --enable-stl --enable-std_iostreams --enable-std_string --disable-compat28"/>
-            <compile-all/>
-            <run-tests/>
-        </steps>
-    </build>
-
-    <build>
-        <name>Linux i386 wxGTK stable STL debug</name>
-        <builddir>ravnsgaard_wxgtk_stable_debug</builddir>
-        <scheduler>daily_0600</scheduler>
-        <steps>
-            <checkout branch="{$STABLE_BRANCH}"/>
-            <configure options="--with-gtk --enable-debug --enable-stl --enable-std_iostreams --enable-std_string --disable-compat26"/>
-            <compile-all utils="false"/>
-            <run-tests/>
-        </steps>
-    </build>
-
-    <build>
-        <name>Linux i386 wxGTK trunk STL release</name>
+        <name>Linux i386 wxGTK trunk STL</name>
         <builddir>ravnsgaard_wxgtk_release</builddir>
         <scheduler>trunk_quick</scheduler>
         <steps>
             <checkout/>
-            <configure options="--with-gtk --disable-debug --enable-stl --enable-std_iostreams --enable-std_string --disable-compat28"/>
+            <configure options="--enable-stl"/>
             <compile-all/>
             <run-tests/>
         </steps>
     </build>
-
-    <build>
-        <name>Linux i386 wxGTK stable STL release</name>
-        <builddir>ravnsgaard_wxgtk_stable_release</builddir>
-        <scheduler>stable_quick</scheduler>
-        <steps>
-            <checkout branch="{$STABLE_BRANCH}"/>
-            <configure options="--with-gtk --disable-debug --enable-stl --enable-std_iostreams --enable-std_string --disable-compat26"/>
-            <compile-all utils="false"/>
-            <run-tests/>
-        </steps>
-    </build>
 </bot>