diff --git a/tools/buildbot/bootstrap.pl b/tools/buildbot/bootstrap.pl
index f4a86256..9e5c14c4 100755
--- a/tools/buildbot/bootstrap.pl
+++ b/tools/buildbot/bootstrap.pl
@@ -10,8 +10,8 @@ chdir($path);
 
 require 'helpers.pm';
 
-#Go back to main source dir.
-chdir(Build::PathFormat('../..'));
+#Go back above build dir
+chdir(Build::PathFormat('../../..'));
 
 #Get the source path.
 our ($root) = getcwd();
@@ -26,7 +26,7 @@ if (!(-d 'OUTPUT')) {
 	if (-d 'OUTPUT/sentinel') {
 		my @s = stat('OUTPUT/sentinel');
 		my $mtime = $s[9];
-		my @files = ('pushbuild.txt', 'AMBuildScript', 'product.version');
+		my @files = ('build/pushbuild.txt', 'build/AMBuildScript', 'build/product.version');
 		my ($i);
 		for ($i = 0; $i <= $#files; $i++) {
 			if (IsNewer($files[$i], $mtime)) {
@@ -44,19 +44,18 @@ if ($reconf) {
 	my ($result);
 	print "Attempting to reconfigure...\n";
 	if ($^O eq "linux") {
-		$result = `python3.1 ../configure.py --enable-optimize`;
+		$result = `python3.1 ../build/configure.py --enable-optimize`;
 	} else {
-		$result = `C:\\Python31\\Python.exe ..\\configure.py --enable-optimize`;
+		$result = `C:\\Python31\\Python.exe ..\\build\\configure.py --enable-optimize`;
 	}
 	print "$result\n";
 	if ($? == -1) {
 		die('Could not configure!');
-	} elsif ($? >> 8 != 0) {
-		die('Could not configure!');
 	}
 }
 
 open(FILE, '>OUTPUT/sentinel');
+print FILE "this is nothing.\n";
 close(FILE);
 
 sub IsNewer
@@ -68,3 +67,6 @@ sub IsNewer
 	return $mtime > $time;
 }
 
+exit(0);
+
+
diff --git a/tools/buildbot/startbuild.pl b/tools/buildbot/startbuild.pl
index 924e1c93..d5a491bd 100755
--- a/tools/buildbot/startbuild.pl
+++ b/tools/buildbot/startbuild.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# vim: set ts=2 sw=2 tw=99 noet: 
 
 use File::Basename;
 
@@ -7,33 +8,28 @@ chdir($path);
 
 require 'helpers.pm';
 
-chdir('..');
-chdir('..');
+chdir('../../../OUTPUT');
 
-my ($cmd, $output);
-
-$cmd = Build::PathFormat('tools/builder/builder.exe') . ' build.cfg'; # 2>&1';
-
-if ($^O eq "linux")
-{
-    $cmd = 'mono ' . $cmd;
+if ($^O eq "linux") {
+	system("python3.1 build.py");
+} else {
+	system("C:\\Python31\\python.exe build.py");
 }
 
-system($cmd);
-
 if ($? == -1)
 {
-    die "Build failed: $!\n";
+	die "Build failed: $!\n";
 }
 elsif ($^O eq "linux" and $? & 127)
 {
-    die "Build died :(\n";
+	die "Build died :(\n";
 }
 elsif ($? >> 8 != 0)
 {
-    die "Build failed with exit code: " . ($? >> 8) . "\n";
+	die "Build failed with exit code: " . ($? >> 8) . "\n";
 }
 else
 {
-    exit(0);
+	exit(0);
 }
+