--- a/src/main.aap
+++ b/src/main.aap
@@ -237,6 +237,7 @@ Source =
 	fileio.c
 	fold.c
 	getchar.c
+        hardcopy.c
 	hashtable.c
 	if_cscope.c
 	if_xcmdsrv.c
@@ -440,6 +441,7 @@ HELPSUBDIR = /doc
 COLSUBDIR = /colors
 SYNSUBDIR = /syntax
 INDSUBDIR = /indent
+AUTOSUBDIR = /autoload
 PLUGSUBDIR = /plugin
 FTPLUGSUBDIR = /ftplugin
 LANGSUBDIR = /lang
@@ -459,6 +461,7 @@ PODIR = po
 ### COLSUBLOC	location for colorscheme files
 ### SYNSUBLOC	location for syntax files
 ### INDSUBLOC	location for indent files
+### AUTOSUBLOC	location for standard autoload files
 ### PLUGSUBLOC	location for standard plugin files
 ### FTPLUGSUBLOC  location for ftplugin files
 ### LANGSUBLOC	location for language files
@@ -478,6 +481,7 @@ HELPSUBLOC	= $VIMRTLOC$HELPSUBDIR
 COLSUBLOC	= $VIMRTLOC$COLSUBDIR
 SYNSUBLOC	= $VIMRTLOC$SYNSUBDIR
 INDSUBLOC	= $VIMRTLOC$INDSUBDIR
+AUTOSUBLOC	= $VIMRTLOC$AUTOSUBDIR
 PLUGSUBLOC	= $VIMRTLOC$PLUGSUBDIR
 FTPLUGSUBLOC	= $VIMRTLOC$FTPLUGSUBDIR
 LANGSUBLOC	= $VIMRTLOC$LANGSUBDIR
@@ -566,6 +570,9 @@ SYNSOURCE = ../runtime/syntax
 INDSOURCE = ../runtime/indent
 
 # Where to copy the standard plugin files from
+AUTOSOURCE = ../runtime/autoload
+
+# Where to copy the standard plugin files from
 PLUGSOURCE = ../runtime/plugin
 
 # Where to copy the ftplugin files from
@@ -600,6 +607,7 @@ DEST_HELP = $DESTDIR$HELPSUBLOC
 DEST_COL = $DESTDIR$COLSUBLOC
 DEST_SYN = $DESTDIR$SYNSUBLOC
 DEST_IND = $DESTDIR$INDSUBLOC
+DEST_AUTO = $DESTDIR$AUTOSUBLOC
 DEST_PLUG = $DESTDIR$PLUGSUBLOC
 DEST_FTP = $DESTDIR$FTPLUGSUBLOC
 DEST_LANG = $DESTDIR$LANGSUBLOC
@@ -614,7 +622,7 @@ DEST_MAN = $DESTDIR$MANSUBDIR
 
 # These are directories, create them when needed.
 :attr {directory = $DIRMOD} $DEST_BIN $DEST_VIM $DEST_RT $DEST_HELP $DEST_COL
-		$DEST_SYN $DEST_IND $DEST_PLUG $DEST_FTP $DEST_LANG
+		$DEST_SYN $DEST_IND $DEST_AUTO $DEST_PLUG $DEST_FTP $DEST_LANG
 		$DEST_COMP $DEST_KMAP $DEST_MACRO $DEST_TOOLS $DEST_TUTOR
 		$DEST_SCRIPT $DEST_PRINT $DEST_MAN
 
@@ -657,7 +665,8 @@ installvimbin {virtual}{force}: $Target 
 # install the help files; first adjust the contents for the location
 installruntime {virtual}{force}: $HELPSOURCE/vim.1 $DEST_MAN $DEST_VIM
 		$DEST_RT $DEST_HELP $DEST_COL $DEST_SYN $DEST_IND
-		$DEST_FTP $DEST_PLUG $DEST_TUTOR $DEST_COMP $DEST_PRINT
+		$DEST_FTP $DEST_AUTO $DEST_PLUG $DEST_TUTOR $DEST_COMP
+                $DEST_PRINT
 	:print generating $DEST_MAN/$(VIMNAME).1
 	:cat $HELPSOURCE/vim.1 |
 		:eval re.sub("/usr/local/lib/vim", _no.VIMLOC, stdin) |
@@ -762,6 +771,9 @@ installruntime {virtual}{force}: $HELPSO
 # install the indent files
 	:copy $INDSOURCE/*.vim $INDSOURCE/README.txt $DEST_IND
 	:chmod $HELPMOD $DEST_IND/*.vim
+# install the standard autoload files
+	:copy $AUTOSOURCE/*.vim $AUTOSOURCE/README.txt $DEST_AUTO
+	:chmod $HELPMOD $DEST_AUTO/*.vim $DEST_AUTO/README.txt
 # install the standard plugin files
 	:copy $PLUGSOURCE/*.vim $PLUGSOURCE/README.txt $DEST_PLUG
 	:chmod $HELPMOD $DEST_PLUG/*.vim $DEST_PLUG/README.txt
@@ -1041,8 +1053,9 @@ uninstall_runtime {virtual}{force}:
     :del {force}{recursive} $DEST_COMP
     :deldir {force} $DEST_HELP $DEST_COL $DEST_SYN $DEST_IND
     :del {force}{recursive} $DEST_FTP/*.vim $DEST_FTP/README.txt
+    :del {force} $DEST_AUTO/*.vim $DEST_AUTO/README.txt
     :del {force} $DEST_PLUG/*.vim $DEST_PLUG/README.txt
-    :deldir {force} $DEST_FTP $DEST_PLUG $DEST_PRINT $DEST_RT
+    :deldir {force} $DEST_FTP $DEST_AUTO $DEST_PLUG $DEST_PRINT $DEST_RT
 #	This will fail when other Vim versions are installed, no worries.
     @try:
 	:deldir $DEST_VIM