1 files changed, 20 insertions, 12 deletions
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index 65e4d267d..584fd4513 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-binutils-pass2">
+<sect1 id="ch-tools-binutils-pass2" role="wrap">
 <title>Binutils-&binutils-version; - Pass 2</title>
 <?dbhtml filename="binutils-pass2.html"?>
 
@@ -11,11 +11,17 @@
 <primary sortas="a-Binutils">Binutils</primary>
 <secondary>tools, pass 2</secondary></indexterm>
 
-<screen>&buildtime; 1.5 SBU
-&diskspace; 108 MB</screen>
+<sect2 role="package"><title/>
 
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>1.5 SBU</seg><seg>108 MB</seg></seglistitem>
+</segmentedlist>
 
-<sect2>
+</sect2>
+
+<sect2 role="installation">
 <title>Re-installation of Binutils</title>
 
 <para>Create a separate build directory again:</para>
@@ -30,13 +36,15 @@ cd ../binutils-build</userinput></screen>
 
 <para>The meaning of the new configure option:</para>
 
-<itemizedlist>
-<listitem><para><userinput>--with-lib-path=/tools/lib</userinput>: This tells
-the configure script to specify the library search path during the compilation
-of Binutils, resulting in <emphasis>/tools/lib</emphasis> to be passed to the
-linker. This prevents the linker from searching through library directories on
-the host.</para></listitem>
-</itemizedlist>
+<variablelist>
+<varlistentry>
+<term><userinput>--with-lib-path=/tools/lib</userinput></term>
+<listitem><para>This tells the configure script to specify the library search path 
+during the compilation of Binutils, resulting in <emphasis>/tools/lib</emphasis> 
+to be passed to the linker. This prevents the linker from searching through library 
+directories on the host.</para></listitem>
+</varlistentry>
+</variablelist>
 
 <para>Before starting to build Binutils, remember to unset any environment
 variables that override the default optimization flags.</para>
@@ -88,7 +96,7 @@ in the state they are in now.</para></warning>
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-binutils"/>.</para>
 </sect2>