diff --git a/README.md b/README.md
index bb3dd71316..20567c1dc0 100644
--- a/README.md
+++ b/README.md
@@ -57,9 +57,6 @@ To build the software you can use `./waf build`: the result of the compilation
 will be located in `build/mpv`. You can use `./waf install` to install mpv
 to the *prefix* after it is compiled.
 
-NOTE: Using the old build system (with `./old-configure`) should still work,
-but will be removed in a future version of mpv.
-
 Essential dependencies (incomplete list):
 
 - gcc or clang
diff --git a/old-configure b/TOOLS/old-configure
similarity index 99%
rename from old-configure
rename to TOOLS/old-configure
index a36d83e7d9..edc0dc1196 100755
--- a/old-configure
+++ b/TOOLS/old-configure
@@ -858,7 +858,7 @@ CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
 # in-tree builds.
 
 if test ! -f Makefile ; then
-    ln -s old-makefile Makefile
+    ln -s TOOLS/old-makefile Makefile
 fi
 
 cat > old_build/config.mak << EOF
diff --git a/old-makefile b/TOOLS/old-makefile
similarity index 100%
rename from old-makefile
rename to TOOLS/old-makefile