diff --git a/usr.bin/man/Makefile b/usr.bin/man/Makefile
index 984930c..e517bbb 100644
--- a/usr.bin/man/Makefile
+++ b/usr.bin/man/Makefile
@@ -1,7 +1,7 @@
 #
 # Devin Reade, 1998
 #
-# $Id: Makefile,v 1.1 1998/03/29 07:15:38 gdr-ftp Exp $
+# $Id: Makefile,v 1.2 1998/03/29 20:52:14 gdr-ftp Exp $
 #
 
 CUSTOM_RULES	= true		# provide our own build rules
@@ -24,8 +24,9 @@ DESC		= manpack.desc
 
 RELSBIN	= $(RELEASE_DIR)$(SBINDIR)
 
-PROGS		= $(OBJ_DIR)apropos $(OBJ_DIR)catman $(OBJ_DIR)makewhatis \
-		  $(OBJ_DIR)man $(OBJ_DIR)whatis
+PROGS1		= $(OBJ_DIR)apropos $(OBJ_DIR)man $(OBJ_DIR)whatis
+PROGS8		= $(OBJ_DIR)catman $(OBJ_DIR)makewhatis
+PROGS		= $(PROGS1) $(PROGS8)
 
 APROPOS_OBJ	= apropos.o apropos2.o util.o globals.o
 CATMAN_OBJ	= catman.o util.o globals.o common.o
@@ -73,16 +74,16 @@ RELDIRS	= $(RELSBIN) $(BINDIR) $(MANDIR)/man1 $(MANDIR)/man8 $(DESC_DIR)
 release: $(PROGS) $(M1) $(M8) $(DESC)
 	$(INSTALL) -d $(RELSBIN) $(RELBIN) $(RELMAN)/man1 $(RELMAN)/man8
 	$(INSTALL) -d $(DESC_DIR)
-	$(INSTALL) apropos man whatis $(RELBIN)
-	$(INSTALL) catman makewhatis $(RELSBIN)
+	$(INSTALL) $(PROGS1) $(RELBIN)
+	$(INSTALL) $(PROGS8) $(RELSBIN)
 	$(INSTALL) $(M1) $(RELMAN)/man1
 	$(INSTALL) $(M8) $(RELMAN)/man8
 	$(DESCU) -o $(DESC_SRC) $(DESC_SRC) $(DESC)
                                   
 install: $(PROGS) $(M1) $(M8)
 	$(INSTALL) -d $(SBINDIR) $(BINDIR) $(MANDIR)/man1 $(MANDIR)/man8
-	$(INSTALL) apropos man whatis $(BINDIR)
-	$(INSTALL) catman makewhatis $(SBINDIR)
+	$(INSTALL) $(PROGS1) $(BINDIR)
+	$(INSTALL) $(PROGS8) $(SBINDIR)
 	$(INSTALL) $(M1) $(MANDIR)/man1
 	$(INSTALL) $(M8) $(MANDIR)/man8
 
diff --git a/usr.bin/man/README b/usr.bin/man/README
index 0d93431..402d2f7 100644
--- a/usr.bin/man/README
+++ b/usr.bin/man/README
@@ -216,6 +216,14 @@ man
 TO DO:
 =====
 
+Here's a possible optimization option:
+	Create a database in the user's home directory that contains a
+	list of all man pages and their locations, based on MANPATH.
+	Keep a magic number (a checksum or hash?) in the file to see if
+	MANPATH has changed.  *maybe* check the date of the file against
+	the modification date of the respective directories and generate a
+	warning if the db is out-of-date.
+
 Makewhatis is not very well integrated with the rest of the package;
 there is still duplication of definitions and functions in some files.