diff --git a/build/Makefile.am b/build/Makefile.am
index 020515c0..d4c09cee 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -2,7 +2,7 @@
 include $(top_srcdir)/build/autotools/common.am
 
 EXTRA_DIST = lol-build \
-             check-source.sh \
+             check-source.sh run-bitten.sh \
              build-linux build-mingw build-mingw64 build-ps3 \
              build-nacl32 build-nacl64 \
              \
diff --git a/build/lol-build b/build/lol-build
index 36a543b5..b1878481 100755
--- a/build/lol-build
+++ b/build/lol-build
@@ -61,6 +61,11 @@ __init__()
       [1-9]|[1-9][0-9]|[1-9][0-9][0-9]) ;;
       *) cpu_count="$(CPUInfo.exe | sed -ne 's/CPU Cores.* \([0-9][0-9]*\)/\1/p')" ;;
     esac
+    # Otherwise, Windows may define NUMBER_OF_PROCESSORS
+    case "$cpu_count" in
+      [1-9]|[1-9][0-9]|[1-9][0-9][0-9]) ;;
+      *) cpu_count="$NUMBER_OF_PROCESSORS" ;;
+    esac
     # Otherwise, be conservative and assume 1 CPU core
     case "$cpu_count" in
       [1-9]|[1-9][0-9]|[1-9][0-9][0-9]) ;;
diff --git a/build/run-bitten.sh b/build/run-bitten.sh
new file mode 100644
index 00000000..66fd1676
--- /dev/null
+++ b/build/run-bitten.sh
@@ -0,0 +1,117 @@
+#!/bin/sh
+
+conffile="`mktemp`"
+url="http://lol.zoy.org/builds"
+
+append() {
+  echo "$*" >> "$conffile"
+}
+
+#
+# Check for command line
+#
+
+if [ "$#" != 2 ]; then
+    echo "Usage: $0 <username> <password>"
+    exit 1
+fi
+
+#
+# Operating system information
+#
+
+append "[os]"
+append "name = `uname -srvmo`"
+append "version = 0"
+family="`uname -s | tr A-Z a-z`"
+case "$family" in
+  mingw*) family="windows" ;;
+  darwin*) family="osx" ;;
+esac
+append "family = $family"
+append "token = $RANDOM"
+append ""
+
+#
+# Hardware information
+#
+
+append "[machine]"
+name="`uname -n | tr A-Z a-z`"
+case "$name" in
+  d*e*s*o*v*) name="putois" ;;
+esac
+append "name = $name"
+processor="`uname -m`"
+case "$processor" in
+  x86_64) processor="amd64" ;;
+  i*86) processor="i386" ;;
+esac
+# Windows defines a lot of crazy shit, 
+case "$PROCESSOR_ARCHITECTURE" in
+  amd64|AMD64) processor="amd64" ;;
+  x86|X86) processor="i386" ;;
+esac
+case "$PROCESSOR_ARCHITEW6432" in
+  amd64|AMD64) processor="amd64" ;;
+  x86|X86) processor="i386" ;;
+esac
+append "processor = $processor"
+append ""
+
+#
+# Authentication information
+#
+
+append "[authentication]"
+append "username = $1"
+append "password = $2"
+append ""
+
+#
+# Visual Studio configuration
+#
+
+# FIXME: we also need to check for the Visual Studio SDK
+append "[msvc]"
+if [ -n "$VS100COMNTOOLS" ]; then
+  append "version = 10"
+elif [ -n "$VS110COMNTOOLS" ]; then
+  append "version = 11"
+elif [ -n "$VS90COMNTOOLS" ]; then
+  append "version = 9"
+fi
+append ""
+
+#
+# Xbox development kit
+#
+
+append "[xdk]"
+if [ -n "$XEDK" ]; then
+  # FIXME: we don't know how to check the version
+  append "version = 2.0.20675.0"
+fi
+append ""
+
+#
+# PS3 development kit
+#
+
+append "[ps3sdk]"
+if [ -n "$SN_PS3_PATH" ]; then
+  append "version = 410"
+fi
+append ""
+
+#
+# Launch everything
+#
+
+while : ; do
+    bitten-slave "$url" -f "$conffile" --name "$name"
+    sleep 10
+done
+
+rm -f "$conffile"
+
diff --git a/build/vs2010/Lol.sln b/build/vs2010/Lol.sln
index 395ccc90..bed32332 100644
--- a/build/vs2010/Lol.sln
+++ b/build/vs2010/Lol.sln
@@ -531,20 +531,26 @@ Global
 		{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
 		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|PS3.ActiveCfg = Debug|x64
+		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|PS3.ActiveCfg = Debug|PS3
+		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|PS3.Build.0 = Debug|PS3
 		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Win32.Build.0 = Debug|Win32
 		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|x64.ActiveCfg = Debug|x64
 		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|x64.Build.0 = Debug|x64
-		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Xbox 360.ActiveCfg = Debug|x64
+		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
+		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
+		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
 		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Any CPU.ActiveCfg = Release|Win32
 		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|PS3.ActiveCfg = Release|x64
+		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|PS3.ActiveCfg = Release|PS3
+		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|PS3.Build.0 = Release|PS3
 		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Win32.ActiveCfg = Release|Win32
 		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Win32.Build.0 = Release|Win32
 		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|x64.ActiveCfg = Release|x64
 		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|x64.Build.0 = Release|x64
-		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Xbox 360.ActiveCfg = Release|x64
+		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
+		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Xbox 360.Build.0 = Release|Xbox 360
+		{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
 		{58922993-9830-4A40-B462-0326342F69ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{58922993-9830-4A40-B462-0326342F69ED}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{58922993-9830-4A40-B462-0326342F69ED}.Debug|PS3.ActiveCfg = Debug|Any CPU