diff --git a/appendixa/automake-dep.xml b/appendixa/automake-dep.xml
index f841e3957..a6f9e23f4 100644
--- a/appendixa/automake-dep.xml
+++ b/appendixa/automake-dep.xml
@@ -1,3 +1,5 @@
+
+
Automake Installation Dependencies
diff --git a/appendixa/automake-desc.xml b/appendixa/automake-desc.xml
index 7879172a4..68cae424e 100644
--- a/appendixa/automake-desc.xml
+++ b/appendixa/automake-desc.xml
@@ -1,13 +1,10 @@
-Contents of Automake
+
+
+Descriptions
Last checked against version &automake-contversion;.
-Program Files
-acinstall, aclocal, aclocal-1.6, automake, automake-1.6,
-compile, config.guess, config.sub, depcomp, elisp-comp, install-sh,
-mdate-sh, missing, mkinstalldirs, py-compile, ylwrap
-
-Descriptions
+Program file descriptions
acinstall
acinstall is a script which installs aclocal-style M4 files.
@@ -25,10 +22,11 @@ Also, the aclocal mechanism is extensible for use
by other packages.
automake, automake-1.6
-To create all the Makefile.in's for a package, run the automake
-program in the top level directory, with no arguments. automake will
-automatically find each appropriate Makefile.am (by scanning
-configure.in) and generate the corresponding Makefile.in.
+To create all the Makefile.in files for a package, run the
+automake program in the top level directory, with no
+arguments. automake will automatically find each appropriate
+Makefile.am (by scanning configure.in) and generate the corresponding
+Makefile.in.
compile
compile is script which acts as a wrapper for compilers.
diff --git a/appendixa/automake-shortdesc.xml b/appendixa/automake-shortdesc.xml
new file mode 100644
index 000000000..13093b4b1
--- /dev/null
+++ b/appendixa/automake-shortdesc.xml
@@ -0,0 +1,13 @@
+Contents of Automake
+
+Last checked against version &automake-contversion;.
+
+Automake generates Makefile.in files, intended for use with Autoconf.
+Modutils installs the following:
+
+Program Files
+acinstall, aclocal, aclocal-1.6, automake, automake-1.6,
+compile, config.guess, config.sub, depcomp, elisp-comp, install-sh,
+mdate-sh, missing, mkinstalldirs, py-compile, ylwrap
+
+
diff --git a/appendixa/automake.xml b/appendixa/automake.xml
index 872e6a0b9..7f80159c5 100644
--- a/appendixa/automake.xml
+++ b/appendixa/automake.xml
@@ -3,6 +3,7 @@
&aa-automake-down;
+&aa-automake-shortdesc;
&aa-automake-desc;
&aa-automake-dep;
diff --git a/chapter06/automake-inst.xml b/chapter06/automake-inst.xml
index ec7f8e296..b1535bd02 100644
--- a/chapter06/automake-inst.xml
+++ b/chapter06/automake-inst.xml
@@ -1,11 +1,20 @@
+
+
Installation of Automake
-Install Automake by running the following commands:
+Prepare Automake to be compiled:
-./configure --prefix=/usr &&
-make install &&
+
+./configure --prefix=/usr
+
+Continue with compiling and installing the package:
+
+make install
+
+Create necessary symbolic link:
+
+
ln -s automake-1.7 /usr/share/automake
-
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 54292a02e..fb821c3b0 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -5,8 +5,8 @@
Estimated build time: &automake-time;
Estimated required disk space: &automake-compsize;
-&c6-automake-inst;
-&aa-automake-desc;
+&aa-automake-shortdesc;
&aa-automake-dep;
+&c6-automake-inst;
diff --git a/entities/automake.ent b/entities/automake.ent
index d7f98e829..aff0e6f35 100644
--- a/entities/automake.ent
+++ b/entities/automake.ent
@@ -4,6 +4,7 @@
+