diff --git a/build/buildbot/config/StellarWerx32.xml b/build/buildbot/config/StellarWerx32.xml
new file mode 100644
index 0000000000..4c9c23962d
--- /dev/null
+++ b/build/buildbot/config/StellarWerx32.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+    Name:       StellarWerx32.xml
+    RCS-ID:     $Id$
+-->
+
+<bot xmlns:xi="http://www.w3.org/2001/XInclude">
+
+<xi:include href="include/unix.xml"/>
+
+<build>
+    <name>Linux x86 wxGTK trunk STL debug</name>
+    <builddir>stellarwerx32_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 wxGTK trunk STL release</name>
+    <builddir>stellarwerx32_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 wxGTK stable STL debug</name>
+    <builddir>stellarwerx32_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 wxGTK stable STL release</name>
+    <builddir>stellarwerx32_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-compat24"/>
+        <compile-all utils="false"/>
+        <run-tests/>
+    </steps>
+</build>
+
+</bot>
diff --git a/build/buildbot/config/StellarWerx64.xml b/build/buildbot/config/StellarWerx64.xml
new file mode 100644
index 0000000000..db12a2100c
--- /dev/null
+++ b/build/buildbot/config/StellarWerx64.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+    Name:       StellarWerx64.xml
+    RCS-ID:     $Id$
+-->
+
+<bot xmlns:xi="http://www.w3.org/2001/XInclude">
+
+<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>
+    <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"/>
+        <run-tests/>
+    </steps>
+</build>
+
+</bot>
diff --git a/build/buildbot/config/brandt32.xml b/build/buildbot/config/brandt32.xml
new file mode 100644
index 0000000000..ef30df7ab8
--- /dev/null
+++ b/build/buildbot/config/brandt32.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+    Name:       brandt32.xml
+    RCS-ID:     $Id$
+-->
+
+<bot xmlns:xi="http://www.w3.org/2001/XInclude">
+
+<xi:include href="include/unix.xml"/>
+
+<build>
+    <name>Linux x86 wxGTK trunk static</name>
+    <builddir>brandt32_gtk</builddir>
+    <!--scheduler>daily_0800</scheduler-->
+    <steps>
+        <checkout/>
+        <configure options="--disable-shared --enable-opengl --enable-svg
+                            --enable-aui --with-gtk=2 --enable-graphics_ctx"/>
+        <compile-all/>
+        <run-tests/>
+    </steps>
+</build>
+
+</bot>
diff --git a/build/buildbot/config/brandt64.xml b/build/buildbot/config/brandt64.xml
new file mode 100644
index 0000000000..4be54c2bff
--- /dev/null
+++ b/build/buildbot/config/brandt64.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+    Name:       brandt64.xml
+    RCS-ID:     $Id$
+-->
+
+<bot xmlns:xi="http://www.w3.org/2001/XInclude">
+
+<xi:include href="include/unix.xml"/>
+
+<build>
+    <name>Linux x86_64 wxGTK trunk static</name>
+    <builddir>brandt64_gtk</builddir>
+    <!--scheduler>daily_0800</scheduler-->
+    <steps>
+        <checkout/>
+        <configure options="--disable-shared --enable-opengl --enable-svg
+                            --enable-aui --with-gtk=2 --enable-graphics_ctx"/>
+        <compile-all/>
+        <run-tests/>
+    </steps>
+</build>
+
+</bot>
diff --git a/build/buildbot/config/heathcliff.xml b/build/buildbot/config/heathcliff.xml
new file mode 100644
index 0000000000..0463c74f25
--- /dev/null
+++ b/build/buildbot/config/heathcliff.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+    Name:       heathcliff.xml
+    RCS-ID:     $Id$
+-->
+
+<bot xmlns:xi="http://www.w3.org/2001/XInclude">
+
+<xi:include href="include/unix.xml"/>
+
+<build>
+    <name>Linux x86_64 wxGTK trunk</name>
+    <builddir>heathcliff_gtk</builddir>
+    <!--scheduler>trunk_quick</scheduler-->
+    <steps>
+        <checkout/>
+        <configure/>
+        <compile-all/>
+        <run-tests/>
+    </steps>
+</build>
+
+</bot>
diff --git a/build/buildbot/config/ravnsgaard.xml b/build/buildbot/config/ravnsgaard.xml
index 78d7c38db2..0f5858a062 100644
--- a/build/buildbot/config/ravnsgaard.xml
+++ b/build/buildbot/config/ravnsgaard.xml
@@ -6,7 +6,7 @@
     Licence:    wxWidgets licence
 -->
 <bot xmlns:xi="http://www.w3.org/2001/XInclude">
-    <xi:include href="include/ravnsgaard.xml"/>
+    <xi:include href="include/unix.xml"/>
 
     <build>
         <name>Linux i386 wxGTK trunk STL debug</name>