diff --git a/Tools/buildbot/Makefile b/Tools/buildbot/Makefile
new file mode 100644
index 00000000000..16602318481
--- /dev/null
+++ b/Tools/buildbot/Makefile
@@ -0,0 +1,6 @@
+all:	kill_python.exe
+	./kill_python.exe
+
+kill_python.exe:	kill_python.c
+	gcc -o kill_python.exe kill_python.c -lpsapi
+
diff --git a/Tools/buildbot/kill_python.c b/Tools/buildbot/kill_python.c
index ebc9aa48553..ca905f57139 100644
--- a/Tools/buildbot/kill_python.c
+++ b/Tools/buildbot/kill_python.c
@@ -42,7 +42,8 @@ int main()
 
 		_strlwr(path);
 		/* printf("%s\n", path); */
-		if (strstr(path, "build\\pcbuild\\python_d.exe") != NULL) {
+		if ((strstr(path, "build\\pcbuild\\python_d.exe") != NULL) ||
+		    (strstr(path, "build\\python.exe") != NULL)) {
 			printf("Terminating %s (pid %d)\n", path, pids[i]);
 			if (!TerminateProcess(hProcess, 1)) {
 				printf("Termination failed: %d\n", GetLastError());