--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4216,6 +4216,8 @@ E830	undo.txt	/*E830*
 E831	editing.txt	/*E831*
 E832	undo.txt	/*E832*
 E833	editing.txt	/*E833*
+E834	options.txt	/*E834*
+E835	options.txt	/*E835*
 E84	windows.txt	/*E84*
 E85	options.txt	/*E85*
 E86	windows.txt	/*E86*

--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -35,6 +35,14 @@ Before release 7.3:
 
 test73 doesn't work on MS-Windows.
 
+Better Czech keymap. (Stepnem, 2010 May 4)  Use if no response from Jiri
+Tobisek.
+
+Use Dutch spell files from:
+http://extensions.services.openoffice.org/en/project/dict-nl
+Looks like this is newer than the new wordlist for Dutch:
+http://www.opentaal.org/bestanden/1_10/nl_NL-Pack
+
 test72 causes a beep for using "u" when it doesn't work.
 
 Cursor positioning wrong with 0x200e character. (John Becket, 2010 May 6)
@@ -66,22 +74,11 @@ accented character. (Tony Mechelynck, 20
 Patch: Let rare word highlighting overrule good word highlighting.
 (Jakson A. Aquino, 2010 Jul 30)
 
-Better Czech keymap. (Stepnem, 2010 May 4)  Use if no response from Jiri
-Tobisek.
-
 ":drop" does not respect 'autochdir'. (Peter Odding, 2010 Jul 24)
 
-Use Dutch spell files from:
-http://extensions.services.openoffice.org/en/project/dict-nl
-Looks like this is newer than the new wordlist for Dutch:
-http://www.opentaal.org/bestanden/1_10/nl_NL-Pack
-
 Problem with cursor in the wrong column. (SungHyun Nam, 2010 Mar 11)
 Additional info by Dominique Pelle. (also on 2010 Apr 10)
 
-"make install" installs some of the .info files on Unix.
-(James Vega, 2010 Mar 30)
-
 Is ~/bin (literally) in $PATH supposed to work?  (Paul, 2010 March 29)
 Looks like only bash can do it. (Yakov Lerner)
 

--- a/src/Makefile
+++ b/src/Makefile
@@ -1944,7 +1944,8 @@ installmacros: $(DEST_VIM) $(DEST_RT) $(
 	chmod $(FILEMOD) `find $(DEST_MACRO) -type f -print`
 	chmod $(SCRIPTMOD) $(DEST_MACRO)/less.sh
 # When using CVS some CVS directories might have been copied.
-	cvs=`find $(DEST_MACRO) \( -name CVS -o -name AAPDIR \) -print`; \
+# Also delete AAPDIR and *.info files.
+	cvs=`find $(DEST_MACRO) \( -name CVS -o -name AAPDIR -o -name "*.info" \) -print`; \
 	      if test -n "$$cvs"; then \
 		 rm -rf $$cvs; \
 	      fi
@@ -1960,6 +1961,7 @@ installgtutorbin: $(DEST_VIM)
 
 installtutor: $(DEST_RT) $(DEST_TUTOR)
 	-$(INSTALL_DATA) $(TUTORSOURCE)/README* $(TUTORSOURCE)/tutor* $(DEST_TUTOR)
+	-rm -f $(DEST_TUTOR)/*.info
 	chmod $(HELPMOD) $(DEST_TUTOR)/*
 
 # Install the spell files, if they exist.  This assumes at least the English