diff --git a/devel/tinderbox/buildbot/master/master.cfg b/devel/tinderbox/buildbot/master/master.cfg
index 8ed82836f..b70f90281 100644
--- a/devel/tinderbox/buildbot/master/master.cfg
+++ b/devel/tinderbox/buildbot/master/master.cfg
@@ -109,13 +109,13 @@ def interested_doxygen(change):
 
 from buildbot.buildslave import BuildSlave
 c['slaves'] = [
-	BuildSlave("mochi", passwd['mochi'], max_builds=1, properties={'os':'Debian', 'version':'5.0.1', 'osname':'Lenny'}),
-	BuildSlave("kokoro", passwd['kokoro'], max_builds=1, properties={'os':'OSX', 'version':'10.5.6', 'osname':'Leopard'}),
+	BuildSlave("mochi", passwd['mochi'], max_builds=1, properties={'os':'Debian', 'version':'5.0.1', 'osname':'Squeeze'}),
+	BuildSlave("kokoro", passwd['kokoro'], max_builds=1, properties={'os':'OSX', 'version':'10.6.3', 'osname':'Snow Leopard'}),
 	BuildSlave("anpan", passwd['anpan'], max_builds=1, properties={'os':'Windows', 'version':'SP2', 'osname':'Vista'}),
-	BuildSlave("tako", passwd['tako'], max_builds=1, properties={'os':'FreeBSD', 'version':'7.1', 'osname':'Stable'}),
-	BuildSlave("nori", passwd['nori'], max_builds=1, properties={'os':'Ubuntu', 'version':'9.04', 'osname':'Jaunty'}),
+	BuildSlave("tako", passwd['tako'], max_builds=1, properties={'os':'FreeBSD', 'version':'9.0', 'osname':'CURRENT'}),
+	BuildSlave("nori", passwd['nori'], max_builds=1, properties={'os':'Ubuntu', 'version':'10.10', 'osname':'Maverick'}),
 	BuildSlave("mokona", passwd['mokona'], max_builds=1, properties={'os':'OSX', 'version': '10.4.11', 'osname':'Tiger'}),
-	BuildSlave("shoyu", passwd['shoyu'], max_builds=2, properties={'os':'Linux', 'version': '???', 'osname':'???'})
+	BuildSlave("shoyu", passwd['shoyu'], max_builds=2, properties={'os':'FreeBSD', 'version': '???', 'osname':'???'})
 ]
 
 
@@ -208,12 +208,10 @@ ffbsd.addStep(shell.ShellCommand(
 
 	command=["./autogen.sh", "--skip-configure"],
 	env={
-		'ACLOCAL_FLAGS': '-I /usr/local/share/aclocal -I /usr/home/verm/build/wx/share/aclocal',
-		'ACLOCAL': 'aclocal-1.10',
-		'AUTOCONF': 'autoconf-2.62',
-		'AUTOHEADER': 'autoheader-2.62',
-		'AUTOMAKE': 'automake-1.10',
-		'LIBTOOLIZE': 'libtoolize'
+		'ACLOCAL_FLAGS': '-I /usr/local/share/aclocal -I /home/verm/build/wx/share/aclocal',
+		'ACLOCAL': 'aclocal-1.11',
+		'AUTOCONF': 'autoconf-2.68',
+		'AUTOHEADER': 'autoheader-2.68'
 	}
 ))
 
@@ -233,9 +231,9 @@ ffbsd.addStep(shell.ShellCommand(
 		'CXX': '/usr/local/libexec/ccache/g++',
 		'CFLAGS': '-I/usr/local/include',
 		'CXXFLAGS': '-I/usr/local/include',
-		'LDFLAGS': '-L/usr/local/lib -rpath /usr/home/verm/build/wx/lib',
-		'LUA_CFLAGS': '-I/usr/local/include/lua51',
-		'LUA_LDFLAGS': '-L/usr/local/lib -llua-5.1'
+		'LDFLAGS': '-rpath /usr/home/verm/build/wx/lib',
+#		'LUA_CFLAGS': '-I/usr/local/include/lua51',
+#		'LUA_LDFLAGS': '-L/usr/local/lib -llua-5.1'
 	},
 	name = "configure",
 	description = ["configuring"],