diff --git a/doc/install.texi b/doc/install.texi
index d814cca..dfe3126 100644
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -12,11 +12,17 @@
 @chapter Installing @AUCTeX{}
 @end ifclear
 
-The simplest way of installing @AUCTeX{} is by using the Emacs package
-manager integrated in Emacs 24 and greater (@acronym{ELPA}).  Simply do
address@hidden package-list-packages RET}, mark the auctex package for
-installation with @kbd{i}, and hit @kbd{x} to execute the installation
-procedure.  That's all.
+The modern and strongly recommended way of installing @AUCTeX{} is by
+using the Emacs package manager integrated in Emacs 24 and greater
+(@acronym{ELPA}).  Simply do @kbd{M-x list-packages RET}, mark the
+auctex package for installation with @kbd{i}, and hit @kbd{x} to execute
+the installation procedure.  That's all.  This installation procedure
+has several advantages.  Besides being platform and @acronym{OS}
+independent, you will receive intermediate releases between major
address@hidden releases conveniently.  For past @acronym{ELPA} releases, see
address@hidden://elpa.gnu.org/packages/auctex.html}.  Once the installation
+is completed, you can skip the rest of this section and proceed to
address@hidden Start}.
 
 The remainder of this section is about installing @AUCTeX{} from a
 release tarball or from a checkout of the @AUCTeX{} repository.
diff --git a/doc/quickstart.texi b/doc/quickstart.texi
index b382018..20d89c3 100644
--- a/doc/quickstart.texi
+++ b/doc/quickstart.texi
@@ -18,7 +18,8 @@ as well, @ref{Installation}.  We also assume that you are familiar with
 the way keystrokes are written in Emacs manuals.  If not, have a look at
 the Emacs Tutorial in the Help menu.
 
-If @AUCTeX{} is installed, you might still need to activate it, by
+If @AUCTeX{} is installed in any other way than from the Emacs package
+manager (@acronym{ELPA}), you might still need to activate it, by
 inserting
 
 @lisp
@@ -27,10 +28,16 @@ inserting
 
 in your user init address@hidden usually is a file in your home
 directory called @file{.emacs} if you are utilizing GNU Emacs or
address@hidden/init.el} if you are using XEmacs.}  If you've installed
address@hidden from the Emacs package manager (ELPA), you must not have this
-line in your user init file.  The installation procedure already cares
-about loading @AUCTeX{} correctly.
address@hidden/init.el} if you are using XEmacs.}
+
+If @AUCTeX{} is installed from @acronym{ELPA}, the installation
+procedure already cares about loading @AUCTeX{} correctly and you
address@hidden not} have the line above in your init file.  Note that this
+also applies if you have the following line in your init file
+
address@hidden
+(package-initialize)
address@hidden lisp
 
 In order to get support for many of the @LaTeX{} packages you will use
 in your documents, you should enable document parsing as well, which can