diff --git a/general.ent b/general.ent
index b60a40c67c..0622a3a477 100644
--- a/general.ent
+++ b/general.ent
@@ -126,7 +126,7 @@
 <!ENTITY pkgconfig-version            "0.17.2">
 <!ENTITY cpio-version                 "2.6">
 <!ENTITY mc-version                   "4.6.0">
-<!ENTITY sysstat-version              "5.1.5">
+<!ENTITY sysstat-version              "6.0.0">
 <!ENTITY apache-ant-version           "1.6.2">
 
 <!-- Chapter 12 -->
diff --git a/general/sysutils/sysstat.xml b/general/sysutils/sysstat.xml
index 88455dfd1d..5237240deb 100644
--- a/general/sysutils/sysstat.xml
+++ b/general/sysutils/sysstat.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY sysstat-download-http "http://perso.wanadoo.fr/sebastien.godard/sysstat-&sysstat-version;.tar.bz2">
   <!ENTITY sysstat-download-ftp  "ftp://ibiblio.org/pub/linux/system/status/sysstat-&sysstat-version;.tar.bz2">
-  <!ENTITY sysstat-md5sum        "075488cbb5979deec0ab05f3ca0c8d12">
+  <!ENTITY sysstat-md5sum        "706044b99a29b7de7bf4b06310bbe6a6">
   <!ENTITY sysstat-size          "118 KB">
-  <!ENTITY sysstat-buildsize     "1.88 MB">
-  <!ENTITY sysstat-time          "0.04 SBU">
+  <!ENTITY sysstat-buildsize     "2 MB">
+  <!ENTITY sysstat-time          "less than 0.1 SBU">
 ]>
 
 <sect1 id="sysstat" xreflabel="Sysstat-&sysstat-version;">
@@ -73,6 +73,8 @@
 <screen><userinput>make config &amp;&amp;
 make</userinput></screen>
 
+    <para>This package does not come with a test suite.</para>
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install</userinput></screen>
@@ -85,14 +87,15 @@ make</userinput></screen>
     <para><command>make config</command>: Runs the interactive configuration
     process. The first question prompts you for an
     <quote><computeroutput>Installation directory</computeroutput></quote>.
-    Reply with <filename class="directory">/usr</filename>, as this is equivalent to
-    <application>Autoconf</application>'s <option>--prefix=/usr</option> parameter
-    to <command>configure</command>. For all other prompts, you may
-    press <keycap>Enter</keycap> to accept the (very sane) defaults. When
-    prompted for <quote><computeroutput>Number of daily data files to keep:
-    [7]</computeroutput></quote>, you may wish to keep a larger number of files.
-    However, don't exceed 25 because <application>Sysstat</application> will
-    resuse existing files the next month, leading to erroneous daily reports.</para>
+    Reply with <filename class="directory">/usr</filename>, as this is
+    equivalent to <application>Autoconf</application>'s
+    <option>--prefix=/usr</option> parameter to <command>configure</command>.
+    For all other prompts, you may press <keycap>Enter</keycap> to accept the
+    (very sane) defaults. When prompted for <quote><computeroutput>Number of
+    daily data files to keep: [7]</computeroutput></quote>, you may wish to
+    keep a larger number of files. However, don't exceed 25 because
+    <application>Sysstat</application> will resuse existing files the next
+    month, leading to erroneous daily reports.</para>
 
   </sect2>
 
@@ -136,11 +139,12 @@ make</userinput></screen>
         <primary sortas="f-sysstat">sysstat</primary>
       </indexterm>
 
-      <para>At system startup, a LINUX RESTART message must be inserted in the daily
-      data file to reinitialize the kernel counters. This can be automated by
-      installing the <filename>/etc/rc.d/init.d/sysstat</filename> init script
-      included in the <xref linkend="intro-important-bootscripts"/> package using
-      the following command:</para>
+      <para>At system startup, a LINUX RESTART message must be inserted in the
+      daily data file to reinitialize the kernel counters. This can be
+      automated by installing the <filename>/etc/rc.d/init.d/sysstat</filename>
+      init script included in the <xref linkend="intro-important-bootscripts"/>
+      package using the following command as the 
+      <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install-sysstat</userinput></screen>
 
@@ -157,9 +161,10 @@ make</userinput></screen>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>iostat, mpstat, sar, sa1, sa2, and sadc</seg>
+        <seg>iostat, mpstat, sar, sa1, sa2, sadc and sadf</seg>
         <seg>None</seg>
-        <seg>/usr/lib/sa and /var/log/sa</seg>
+        <seg>/usr/lib/sa, /usr/share/doc/sysstat-&sysstat-version; and 
+        /var/log/sa</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -182,7 +187,8 @@ make</userinput></screen>
       <varlistentry id="mpstat">
         <term><command>mpstat</command></term>
         <listitem>
-          <para>reports individual or combined processor related statistics.</para>
+          <para>reports individual or combined processor related 
+          statistics.</para>
           <indexterm zone="sysstat mpstat">
             <primary sortas="b-mpstat">mpstat</primary>
           </indexterm>
@@ -192,7 +198,8 @@ make</userinput></screen>
       <varlistentry id="sar">
         <term><command>sar</command></term>
         <listitem>
-          <para> collects, reports and saves system activity information.</para>
+          <para> collects, reports and saves system activity 
+          information.</para>
           <indexterm zone="sysstat sar">
             <primary sortas="b-sar">sar</primary>
           </indexterm>
@@ -203,8 +210,8 @@ make</userinput></screen>
         <term><command>sa1</command></term>
         <listitem>
           <para>collects and stores binary data in the system activity daily
-          data file. It is a front end to <filename>sadc</filename> designed to be run
-          from cron.</para>
+          data file. It is a front end to <filename>sadc</filename> designed
+          to be run from cron.</para>
           <indexterm zone="sysstat sa1">
             <primary sortas="b-sa1">sa1</primary>
           </indexterm>
@@ -233,6 +240,19 @@ make</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="sadf">
+        <term><command>sadf</command></term>
+        <listitem>
+          <para>is used for displaying the contents of data files created by
+          the <command>sar</command> command. But unlike
+          <command>sar</command>, <command>sadf</command> can write its data
+          in many different formats.</para>
+          <indexterm zone="sysstat sadf">
+            <primary sortas="b-sadf">sadf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
   </sect2>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index e157e1c637..683e1ef14d 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -25,7 +25,8 @@
   <itemizedlist>
 
     <listitem>
-      <para>June 1st, 2005 [randy]: Updated to Galeon-1.3.21.</para>
+      <para>June 1st, 2005 [randy]: Updated to Galeon-1.3.21 and 
+      Sysstat-6.0.0.</para>
     </listitem>
 
     <listitem>