diff --git a/Lib/pydoc.py b/Lib/pydoc.py
old mode 100755
new mode 100644
diff --git a/Lib/site-packages/README b/Lib/site-packages/README
new file mode 100644
index 00000000000..273f6251a7f
--- /dev/null
+++ b/Lib/site-packages/README
@@ -0,0 +1,2 @@
+This directory exists so that 3rd party packages can be installed
+here.  Read the source for site.py for more details.
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
old mode 100755
new mode 100644
diff --git a/Lib/timeit.py b/Lib/timeit.py
old mode 100755
new mode 100644
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
old mode 100755
new mode 100644
diff --git a/Tools/buildbot/build-amd64.bat b/Tools/buildbot/build-amd64.bat
new file mode 100644
index 00000000000..f77407bcf70
--- /dev/null
+++ b/Tools/buildbot/build-amd64.bat
@@ -0,0 +1,5 @@
+@rem Formerly used by the buildbot "compile" step.
+@echo This script is no longer used and may be removed in the future.
+@echo To get the same effect as this script, use
+@echo     PCbuild\build.bat -d -e -k -p x64
+call "%~dp0build.bat" -p x64 %*
diff --git a/Tools/buildbot/clean-amd64.bat b/Tools/buildbot/clean-amd64.bat
new file mode 100644
index 00000000000..b53c7c1038d
--- /dev/null
+++ b/Tools/buildbot/clean-amd64.bat
@@ -0,0 +1,5 @@
+@rem Formerly used by the buildbot "clean" step.
+@echo This script is no longer used and may be removed in the future.
+@echo To get the same effect as this script, use `clean.bat` from this
+@echo directory and pass `-p x64` as two arguments.
+call "%~dp0clean.bat" -p x64 %*
diff --git a/Tools/buildbot/external-amd64.bat b/Tools/buildbot/external-amd64.bat
new file mode 100644
index 00000000000..bfaef055f54
--- /dev/null
+++ b/Tools/buildbot/external-amd64.bat
@@ -0,0 +1,3 @@
+@echo This script is no longer used and may be removed in the future.
+@echo Please use PCbuild\get_externals.bat instead.
+@"%~dp0..\..\PCbuild\get_externals.bat" %*
diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat
new file mode 100644
index 00000000000..bfaef055f54
--- /dev/null
+++ b/Tools/buildbot/external.bat
@@ -0,0 +1,3 @@
+@echo This script is no longer used and may be removed in the future.
+@echo Please use PCbuild\get_externals.bat instead.
+@"%~dp0..\..\PCbuild\get_externals.bat" %*
diff --git a/Tools/buildbot/test-amd64.bat b/Tools/buildbot/test-amd64.bat
new file mode 100644
index 00000000000..e48329c0b30
--- /dev/null
+++ b/Tools/buildbot/test-amd64.bat
@@ -0,0 +1,6 @@
+@rem Formerly used by the buildbot "test" step.
+@echo This script is no longer used and may be removed in the future.
+@echo To get the same effect as this script, use
+@echo     PCbuild\rt.bat -q -d -x64 -uall -rwW
+@echo or use `test.bat` in this directory and pass `-x64` as an argument.
+call "%~dp0test.bat" -x64 %*
diff --git a/configure b/configure
old mode 100755
new mode 100644