--- a/INSTALL	Sat Dec 26 00:20:27 2009 -0600
+++ b/INSTALL	Sat Dec 26 21:18:49 2009 -0600
@@ -1,7 +1,7 @@
 XEmacs Installation Guide
 
 Copyright (c) 1994, 1995, 1996 Board of Trustees, University of Illinois
-Copyright (c) 1994-1999, 2003 Free Software Foundation, Inc.
+Copyright (c) 1994-1999, 2003, 2008 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
@@ -61,11 +61,13 @@
 PACKAGE SYSTEM
 ==============
 
-The file README.packages contain information vital to have a fully
+The FAQ sections 1.7 and 2.1 contain information vital to have a fully
 working XEmacs.  It includes a description of available packages, and
 how to bootstrap XEmacs from a minimal or a complete set of packages.
 This information was not included in this file only because it is too
-large for this terse INSTALL.  Please read README.packages now!
+large for this terse INSTALL.  The FAQ is available in Texinfo format
+in man/xemacs-faq.texi, as an Info file once you build XEmacs, and
+online at http://www.xemacs.org/Documentation/21.5/html/xemacs-faq_1.html.
 
 ADD-ON LIBRARIES
 ================
@@ -289,9 +291,6 @@
 you omit this option, `configure' will try to autodetect whether your
 system has X Window System support, and arrange to use it if present.
 
-The `--without-xmu' option can be used if your vendor doesn't ship
-the Xmu library.
-
 The `--with-menubars=TYPE' option allows you to specify which X
 toolkit you wish to use for the menubar.  The valid options are
 `lucid', `motif' and `no'.  The default is `lucid' which is a
@@ -380,11 +379,6 @@
 drop support.  `configure' will attempt to detect this option and
 define `--with-cde' for you.
 
-The `--with-offix' option allows you to enable or disable OffiX drag
-and drop support.  This requires no external library support, so if
-X11 support is available, then this option defaults to `yes'.  OffiX
-support can be explicitly disabled via the `--with-offix=no' option.
-
 Internationalization Options
 ----------------------------
 
@@ -571,7 +565,7 @@
 
 `/usr/local/bin' holds the executable programs users normally run -
 		`xemacs', `etags', `ctags', `b2m', `emacsclient', `ellcc',
-		`gnuclient', `gnudoit', `gnuattach', and `rcs-checkin'.
+		`gnuclient', `gnudoit', and `gnuattach'.
 
 `/usr/local/lib/xemacs-VERSION/lisp' holds the Emacs Lisp libraries;
 		`VERSION' stands for the number of the XEmacs version
@@ -587,7 +581,7 @@
 		`/usr/local/lib/xemacs/site-lisp/*'.
 
 `/usr/local/lib/xemacs-VERSION/etc' holds the XEmacs tutorial, the
-		`yow' database, and other architecture-independent
+		Unicode database, and other architecture-independent
 		files XEmacs might need while running.  VERSION is as
 		specified for `.../lisp'.
 
@@ -794,8 +788,8 @@
 remove the files that `configure' created (so you can compile XEmacs
 for a different configuration), type `make distclean'.
 
-READ README.packages
-====================
+READ THE FAQ
+============
 
 Do it!
 
@@ -803,8 +797,8 @@
 ========
 
 The most common problem is that you forgot to read and follow the
-directions in README.packages.  You can not have a normal XEmacs
-without downloading some additional packages.
+directions for installing bootstrap packages in the FAQ.  You can not
+have a normal XEmacs without downloading some additional packages.
 
 See the file PROBLEMS in this directory for a list of various problems
 sometimes encountered, and what to do about them.  PROBLEMS is also
@@ -875,7 +869,6 @@
 
 --with-site-lisp          Unchanged
 --with-site-modules       Unchanged
---package-prefix          --with-package-prefix
 --package-path            --with-package-path
 --infopath                --with-infopath
 
@@ -897,7 +890,6 @@
 --with-widgets            Unchanged
 --with-dragndrop          Unchanged
 --with-cde                Unchanged
---with-offix              Unchanged
 --with-xmu                Unchanged
 --external-widget         --with-external-widget