diff --git a/es_ES.ISO8859-1/books/handbook/chapters.ent b/es_ES.ISO8859-1/books/handbook/chapters.ent
index f022a48532..d8d823040a 100755
--- a/es_ES.ISO8859-1/books/handbook/chapters.ent
+++ b/es_ES.ISO8859-1/books/handbook/chapters.ent
@@ -1,52 +1,48 @@
 <!-- 
      Crea entidades para cada uno de los cap&iacute;tulos en el Manual de
      FreeBSD. Cada entidad es nombrada como chap.foo, donde foo es el
      atributo identificador en ese cap&iacute;tulo y corresponde al
      nombre del directorio en el que est&aacute; guardado el archivo
      .sgml que contiene la informaci&oacute;n.
    
      Chapters should be listed in the order in which they are referenced.
      Los cap&iacute;tulos deben listarse en el mismo orden en el que son
      referenciados.
  
      $FreeBSD$
 -->
 
+<!ENTITY chap.preface                   SYSTEM "preface/preface.sgml">
+
 <!-- Part one -->
-<!ENTITY chap.introduction		SYSTEM "introduction/chapter.sgml">
-<!ENTITY chap.install			SYSTEM "install/chapter.sgml">
-<!ENTITY chap.basics			SYSTEM "basics/chapter.sgml">
-<!ENTITY chap.ports			SYSTEM "ports/chapter.sgml">
+<!ENTITY chap.introduction              SYSTEM "introduction/chapter.sgml">
+<!ENTITY chap.install                   SYSTEM "install/chapter.sgml">
+<!ENTITY chap.basics                    SYSTEM "basics/chapter.sgml">
+<!ENTITY chap.ports                     SYSTEM "ports/chapter.sgml">
 
 <!-- Part two -->
-<!ENTITY chap.kernelconfig		SYSTEM "kernelconfig/chapter.sgml">
-<!ENTITY chap.security			SYSTEM "security/chapter.sgml">
-<!ENTITY chap.printing			SYSTEM "printing/chapter.sgml">
-<!ENTITY chap.disks			SYSTEM "disks/chapter.sgml">
-<!ENTITY chap.backups                   SYSTEM "backups/chapter.sgml">
-<!ENTITY chap.quotas			SYSTEM "quotas/chapter.sgml">
-<!ENTITY chap.x11			SYSTEM "x11/chapter.sgml">
-<!ENTITY chap.hw			SYSTEM "hw/chapter.sgml">
-<!ENTITY chap.l10n			SYSTEM "l10n/chapter.sgml">
-
-<!-- Part three -->
-<!ENTITY chap.serialcomms		SYSTEM "serialcomms/chapter.sgml">
-<!ENTITY chap.ppp-and-slip		SYSTEM "ppp-and-slip/chapter.sgml">
-<!ENTITY chap.advanced-networking	SYSTEM "advanced-networking/chapter.sgml">
-<!ENTITY chap.mail			SYSTEM "mail/chapter.sgml">
-
-<!-- Part four -->
-<!ENTITY chap.cutting-edge		SYSTEM "cutting-edge/chapter.sgml">
-<!ENTITY chap.contrib			SYSTEM "contrib/chapter.sgml">
-<!ENTITY chap.policies			SYSTEM "policies/chapter.sgml">
-<!ENTITY chap.kernelopts		SYSTEM "kernelopts/chapter.sgml">
-<!ENTITY chap.kerneldebug		SYSTEM "kerneldebug/chapter.sgml">
-<!ENTITY chap.linuxemu			SYSTEM "linuxemu/chapter.sgml">
-<!ENTITY chap.internals			SYSTEM "internals/chapter.sgml">
+<!ENTITY chap.config                    SYSTEM "config/chapter.sgml">
+<!ENTITY chap.boot                      SYSTEM "boot/chapter.sgml">
+<!ENTITY chap.users                     SYSTEM "users/chapter.sgml">
+<!ENTITY chap.kernelconfig              SYSTEM "kernelconfig/chapter.sgml">
+<!ENTITY chap.security                  SYSTEM "security/chapter.sgml">
+<!ENTITY chap.printing                  SYSTEM "printing/chapter.sgml">
+<!ENTITY chap.disks                     SYSTEM "disks/chapter.sgml">
+<!ENTITY chap.vinum                     SYSTEM "vinum/chapter.sgml">
+<!ENTITY chap.x11                       SYSTEM "x11/chapter.sgml">
+<!ENTITY chap.l10n                      SYSTEM "l10n/chapter.sgml">
+<!ENTITY chap.multimedia                SYSTEM "multimedia/chapter.sgml">
+<!ENTITY chap.serialcomms               SYSTEM "serialcomms/chapter.sgml">
+<!ENTITY chap.ppp-and-slip              SYSTEM "ppp-and-slip/chapter.sgml">
+<!ENTITY chap.advanced-networking       SYSTEM "advanced-networking/chapter.sgml">
+<!ENTITY chap.mail                      SYSTEM "mail/chapter.sgml">
+<!ENTITY chap.cutting-edge              SYSTEM "cutting-edge/chapter.sgml">
+<!ENTITY chap.linuxemu                  SYSTEM "linuxemu/chapter.sgml">
 
-<!-- Part five (appendices) -->
-<!ENTITY chap.mirrors			SYSTEM "mirrors/chapter.sgml">
-<!ENTITY chap.bibliography		SYSTEM "bibliography/chapter.sgml">
-<!ENTITY chap.eresources		SYSTEM "eresources/chapter.sgml">
-<!ENTITY chap.staff			SYSTEM "staff/chapter.sgml">
-<!ENTITY chap.pgpkeys			SYSTEM "pgpkeys/chapter.sgml">
+<!-- Part three (appendices) -->
+<!ENTITY chap.mirrors                   SYSTEM "mirrors/chapter.sgml">
+<!ENTITY chap.bibliography              SYSTEM "bibliography/chapter.sgml">
+<!ENTITY chap.eresources                SYSTEM "eresources/chapter.sgml">
+<!ENTITY chap.pgpkeys                   SYSTEM "pgpkeys/chapter.sgml">
+<!ENTITY chap.index                     SYSTEM "index.sgml">
+<!ENTITY chap.colophon                  SYSTEM "colophon.sgml">