diff --git a/automation/Makefile.am b/automation/Makefile.am
index d5e5b7666..cfcb0becc 100644
--- a/automation/Makefile.am
+++ b/automation/Makefile.am
@@ -22,9 +22,9 @@ data_auto4_lua = \
 	autoload/cleantags-autoload.lua \
 	autoload/kara-templater.lua \
 	autoload/karaoke-auto-leadin.lua \
+	autoload/macro-1-edgeblur.lua \
+	autoload/macro-2-mkfullwitdh.lua \
 	demos/future-windy-blur.lua \
-	demos/macro-1-edgeblur.lua \
-	demos/macro-2-mkfullwitdh.lua \
 	demos/raytracer.lua \
 	include/cleantags.lua \
 	include/karaskel-adv.lua \
@@ -58,7 +58,7 @@ data_auto3_lua = \
 	include/utils.auto3
 
 data_auto4_perl = \
-	demos/macro-1p-edgeblur.pl \
+	autoload/macro-1p-edgeblur.pl \
 	demos/perl-console.pl \
 	include/Aegisub/PerlConsole.pm \
 	v4-docs/perl-api.txt
diff --git a/automation/auto3/readme.txt b/automation/auto3/readme.txt
deleted file mode 100644
index 6deb5b5c6..000000000
--- a/automation/auto3/readme.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-This directory contains flexible, configurable Automation scripts to do common jobs,
-without having to do (much) programming.
-
-You can load these scripts into an ASS file in Aegisub, and apply an effect without
-doing more than writing ASS override tags.
-
-
-WARNING!
-DO NOT ADD YOUR OWN FILES TO THIS DIRECTORY,
-they will be deleted when you uninstall/upgrade Aegisub.
-This also means it's unwise to modify these files, if you want to keep your
-changes to them.
diff --git a/automation/demos/macro-1-edgeblur.lua b/automation/autoload/macro-1-edgeblur.lua
similarity index 100%
rename from automation/demos/macro-1-edgeblur.lua
rename to automation/autoload/macro-1-edgeblur.lua
diff --git a/automation/demos/macro-1p-edgeblur.pl b/automation/autoload/macro-1p-edgeblur.pl
similarity index 100%
rename from automation/demos/macro-1p-edgeblur.pl
rename to automation/autoload/macro-1p-edgeblur.pl
diff --git a/automation/demos/macro-2-mkfullwitdh.lua b/automation/autoload/macro-2-mkfullwitdh.lua
similarity index 100%
rename from automation/demos/macro-2-mkfullwitdh.lua
rename to automation/autoload/macro-2-mkfullwitdh.lua
diff --git a/automation/include/readme.txt b/automation/include/readme.txt
deleted file mode 100644
index 24d68d6a3..000000000
--- a/automation/include/readme.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-This directory contains standard include files for Automation.
-By default, this directory is included in the Automation Include Path, which
-means the files here are always available for use with the include() function.
-
-See the Aegisub help and the individual files in this directory for more
-information on their purpose and contents.
-
-
-DO NOT MODIFY THE CONTENTS OF THIS DIRECTORY OR ADD YOUR OWN FILES,
-
-any files added or modified might be deleted or reverted upon upgrade or
-uninstall of Aegisub.
-
-A better solution is to create your own include directory and put it in the
-"Automation Include Path" in the Aegisub config.dat file. The path
-specifications are separated by pipe characters ("|"). Using this method, you
-can also override the default includes with your own, modified versions, by
-placing the path to your own versions earlier in the path list.