diff --git a/en_US.ISO8859-1/books/handbook/config/chapter.sgml b/en_US.ISO8859-1/books/handbook/config/chapter.sgml
index e3205b7a62..c921893589 100644
--- a/en_US.ISO8859-1/books/handbook/config/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/config/chapter.sgml
@@ -2365,6 +2365,14 @@ device_probe_and_attach: cbb0 attach returned 12</screen>
     <sect2 id="acpi-intro">
       <title>What Is ACPI?</title>
 
+      <indexterm>
+	<primary>ACPI</primary>
+      </indexterm>
+
+      <indexterm>
+	<primary>APM</primary>
+      </indexterm>
+
       <para>Advanced Configuration and Power Interface
 	(<acronym>ACPI</acronym>) is a standard written by
 	an alliance of vendors to provide a standard interface for
@@ -2476,6 +2484,11 @@ device_probe_and_attach: cbb0 attach returned 12</screen>
 
     <title>Using and Debugging &os; <acronym>ACPI</acronym></title>
 
+    <indexterm>
+      <primary>ACPI</primary>
+      <secondary>problems</secondary>
+    </indexterm>
+
     <para><acronym>ACPI</acronym> is a fundamentally new way of
       discovering devices, managing power usage, and providing
       standardized access to various hardware previously managed
@@ -2567,6 +2580,10 @@ device_probe_and_attach: cbb0 attach returned 12</screen>
     <sect2 id="ACPI-background">
       <title>Background</title>
 
+      <indexterm>
+	<primary>ACPI</primary>
+      </indexterm>
+
       <para><acronym>ACPI</acronym> is present in all modern computers
 	that conform to the ia32 (x86), ia64 (Itanium), and amd64 (AMD)
 	architectures.  The full standard has many features including
@@ -2608,6 +2625,11 @@ device_probe_and_attach: cbb0 attach returned 12</screen>
     <sect2 id="ACPI-comprob">
       <title>Common Problems</title>
 
+      <indexterm>
+	<primary>ACPI</primary>
+	<secondary>problems</secondary>
+      </indexterm>
+
       <para>For <acronym>ACPI</acronym> to work correctly, all the parts
 	have to work correctly.  Here are some common problems, in order
 	of frequency of appearance, and some possible workarounds or
@@ -2710,6 +2732,10 @@ hw.acpi.s4bios: 0</screen>
 	  <firstterm>System Control Interrupt</firstterm>
 	  (<acronym>SCI</acronym>).</para>
 
+	<indexterm>
+	  <primary>interrupt storms</primary>
+	</indexterm>
+
 	<para>Interrupt storms can be distinguished from lost interrupts
 	  by checking the output of <command>vmstat -i</command>
 	  and looking at the line that has
@@ -2720,6 +2746,11 @@ hw.acpi.s4bios: 0</screen>
 	  <keycap>ALT</keycap><keycap>ESC</keycap></keycombo> on
 	  console) and type <literal>show interrupts</literal>.</para>
 
+	<indexterm>
+	  <primary>ACPI</primary>
+	  <secondary>disabling</secondary>
+	</indexterm>
+
 	<para>Your best hope when dealing with interrupt problems is to
 	  try disabling <acronym>APIC</acronym> support with
 	  <literal>hint.apic.0.disabled="1"</literal> in
@@ -2777,6 +2808,11 @@ hw.acpi.s4bios: 0</screen>
       <title><acronym>ASL</acronym>, <command>acpidump</command>, and
         <acronym>IASL</acronym></title>
 
+      <indexterm>
+	<primary>ACPI</primary>
+	<secondary>ASL</secondary>
+      </indexterm>
+
       <para>The most common problem is the <acronym>BIOS</acronym>
 	vendors providing incorrect (or outright buggy!) bytecode.  This
 	is usually manifested by kernel console messages like
@@ -2813,6 +2849,11 @@ hw.acpi.s4bios: 0</screen>
     <sect2 id="ACPI-fixasl">
       <title>Fixing Your <acronym>ASL</acronym></title>
 
+      <indexterm>
+	<primary>ACPI</primary>
+	<secondary>ASL</secondary>
+      </indexterm>
+
       <para>In the long run, our goal is for almost everyone to have
 	<acronym>ACPI</acronym> work without any user intervention.  At
 	this point, however, we are still developing workarounds for
@@ -2832,6 +2873,11 @@ hw.acpi.s4bios: 0</screen>
 	behavior in <acronym>ACPI-CA</acronym> and thus make your fix
 	unnecessary.</para>
 
+      <indexterm>
+	<primary>ACPI</primary>
+	<secondary>error messages</secondary>
+      </indexterm>
+
       <para>Here is a list of common error messages, their cause, and
 	how to fix them:</para>
 
@@ -2893,6 +2939,16 @@ acpi_dsdt_name="/boot/DSDT.aml"</programlisting>
       <title>Getting Debugging Output From
 	<acronym>ACPI</acronym></title>
 
+      <indexterm>
+	<primary>ACPI</primary>
+	<secondary>problems</secondary>
+      </indexterm>
+
+      <indexterm>
+	<primary>ACPI</primary>
+	<secondary>debugging</secondary>
+      </indexterm>
+
       <para>The <acronym>ACPI</acronym> driver has a very flexible
 	debugging facility.  It allows you to specify a set of subsystems
 	as well as the level of verbosity.  The subsystems you wish to
diff --git a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
index 6f6426b4da..878ad54569 100644
--- a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
@@ -1114,6 +1114,10 @@ device          sc</programlisting>
       device are often not available &mdash; <literal>vt100</literal>
       should be available on virtually any platform.</para>
 
+    <indexterm>
+      <primary>APM</primary>
+    </indexterm>
+
     <programlisting># Power management support (see NOTES for more options)
 #device          apm</programlisting>