Upgrade to Util-linux-2.19. Changed name from util-linux-ng.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9459 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

13 files changed, 169 insertions, 129 deletions

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index f08c69933..a1860fa2e 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -269,7 +269,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Diffutils, E2fsprogs, Findutils, and Util-linux-ng</seg>
+          <seg>Diffutils, E2fsprogs, Findutils, and Util-linux</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -404,7 +404,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
-         Gzip, Make, Pkg-config, Sed, Texinfo, and Util-linux-ng</seg>
+         Gzip, Make, Pkg-config, Sed, Texinfo, and Util-linux</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1429,7 +1429,7 @@
 
         <seglistitem>
           <seg>Bash, GRUB, Inetutils, Less, Procps, Psmisc, Readline, Texinfo,
-          Util-linux-ng, and Vim</seg>
+          Util-linux, and Vim</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1941,8 +1941,8 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Util-linux-ng dependency info -->
-  <bridgehead renderas="sect2" id="util-linux-dep">Util-linux-ng</bridgehead>
+<!-- Begin Util-linux dependency info -->
+  <bridgehead renderas="sect2" id="util-linux-dep">Util-linux</bridgehead>
 
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
@@ -2071,7 +2071,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>File, Module-Init-Tools, Perl, and Util-linux-ng</seg>
+          <seg>File, Module-Init-Tools, Perl, and Util-linux</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f320606c6..c60b2453e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,17 @@
 
 -->
     <listitem>
+      <para>2011-02-10</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] Upgrade to Util-linux-2.19. 
+          Changed name from util-linux-ng. Fixes
+          <ulink url="&lfs-ticket-root;2805">#2805</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2011-02-04</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index e58f88021..e786c919a 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -197,7 +197,7 @@
       <para>&udev-config;</para>
     </listitem>-->
     <!--<listitem>
-      <para>Util-Linux-NG &util-linux-ng-version;</para>
+      <para>Util-Linux &util-linux-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Vim &vim-version;</para>
@@ -255,6 +255,10 @@
       <para>xz-&xz-version;</para>
     </listitem>
 
+    <listitem>
+      <para>util-linux-&util-linux-version;</para>
+    </listitem>
+
   </itemizedlist>
 
   <itemizedlist>
@@ -308,6 +312,10 @@
       <para>tar-1.23-overflow_fix-1.patch</para>
     </listitem>
 
+    <listitem>
+      <para>util-linux-ng-2.18</para>
+    </listitem>
+
   </itemizedlist>
 
 </sect1>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 6146424f4..e78c69535 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -575,11 +575,11 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Util-linux-ng (&util-linux-ng-version;) - <token>&util-linux-ng-size;</token>:</term>
+      <term>Util-linux (&util-linux-version;) - <token>&util-linux-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&util-linux-ng-home;"/></para>
-        <para>Download: <ulink url="&util-linux-ng-url;"/></para>
-        <para>MD5 sum: <literal>&util-linux-ng-md5;</literal></para>
+        <para>Home page: <ulink url="&util-linux-home;"/></para>
+        <para>Download: <ulink url="&util-linux-url;"/></para>
+        <para>MD5 sum: <literal>&util-linux-md5;</literal></para>
       </listitem>
     </varlistentry>
 
diff --git a/chapter05/e2fsprogs.xml b/chapter05/e2fsprogs.xml
index 70fb8cb98..a8f111b14 100644
--- a/chapter05/e2fsprogs.xml
+++ b/chapter05/e2fsprogs.xml
@@ -76,7 +76,7 @@ cd build</userinput></screen>
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>Install the static libraries and headers required by Util-linux-ng:</para>
+    <para>Install the static libraries and headers required by Util-linux:</para>
 
 <screen><userinput remap="install">make install-libs</userinput></screen>
 
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 57c4aba4c..56f9e6a0c 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -30,7 +30,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkg-config.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 4d030aecc..75eeb28d4 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -88,7 +88,7 @@ cd build</userinput></screen>
           <systemitem class="library">libuuid</systemitem> and
           <systemitem class="library">libblkid</systemitem> libraries, the
           <systemitem class="daemon">uuidd</systemitem> daemon, and the
-          <command>fsck</command> wrapper, as Util-Linux-NG installed all of
+          <command>fsck</command> wrapper, as Util-Linux installed all of
           them earlier.</para>
         </listitem>
       </varlistentry>
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index e5726994e..9027e74be 100644
--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@@ -56,7 +56,7 @@
     src/init.c</userinput></screen>
 
     <para>A maintained version of the <command>wall</command> program was
-    installed earlier by Util-linux-ng. Suppress the installation of Sysvinit's
+    installed earlier by Util-linux. Suppress the installation of Sysvinit's
     version of this program and its man page:</para>
 
 <screen><userinput remap="make">sed -i -e 's/utmpdump wall/utmpdump/' \
diff --git a/chapter06/util-linux-ng.xml b/chapter06/util-linux.xml
index 592004070..43c8b47ae 100644
--- a/chapter06/util-linux-ng.xml
+++ b/chapter06/util-linux.xml
@@ -5,25 +5,25 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-system-util-linux-ng" role="wrap">
-  <?dbhtml filename="util-linux-ng.html"?>
+<sect1 id="ch-system-util-linux" role="wrap">
+  <?dbhtml filename="util-linux.html"?>
 
   <sect1info condition="script">
-    <productname>util-linux-ng</productname>
-    <productnumber>&util-linux-ng-version;</productnumber>
-    <address>&util-linux-ng-url;</address>
+    <productname>util-linux</productname>
+    <productnumber>&util-linux-version;</productnumber>
+    <address>&util-linux-url;</address>
   </sect1info>
 
-  <title>Util-linux-ng-&util-linux-ng-version;</title>
+  <title>Util-linux-&util-linux-version;</title>
 
-  <indexterm zone="ch-system-util-linux-ng">
-    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
+  <indexterm zone="ch-system-util-linux">
+    <primary sortas="a-Util-linux">Util-linux</primary>
   </indexterm>
 
   <sect2 role="package">
     <title/>
 
-    <para>The Util-linux-ng package contains miscellaneous utility programs.
+    <para>The Util-linux package contains miscellaneous utility programs.
     Among them are utilities for handling file systems, consoles, partitions,
     and messages.</para>
 
@@ -32,8 +32,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&util-linux-ng-ch6-sbu;</seg>
-        <seg>&util-linux-ng-ch6-du;</seg>
+        <seg>&util-linux-ch6-sbu;</seg>
+        <seg>&util-linux-ch6-du;</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -56,7 +56,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of Util-linux-ng</title>
+    <title>Installation of Util-linux</title>
 
 <screen><userinput remap="configure">./configure --enable-arch --enable-partx --enable-write</userinput></screen>
 
@@ -99,7 +99,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
   </sect2>
 
   <sect2 id="contents-utillinux" role="content">
-    <title>Contents of Util-linux-ng</title>
+    <title>Contents of Util-linux</title>
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
@@ -110,9 +110,9 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <seg>addpart, agetty, arch, blkid, blockdev, cal, cfdisk, chkdupexe,
         chrt, col, colcrt, colrm, column, ctrlaltdel, cytune, ddate, delpart,
         dmesg, fallocate, fdformat, fdisk, findfs, findmnt, flock, fsck,
-        fsck.cramfs, fsck.minix, fsfreeze, getopt, hexdump, hwclock, i386,
+        fsck.cramfs, fsck.minix, fsfreeze, fstrim, getopt, hexdump, hwclock, i386,
         ionice, ipcmk, ipcrm, ipcs, isosize, ldattach, line, linux32, linux64,
-        logger, look, losetup, lscpu, mcookie, mkfs, mkfs.bfs, mkfs.cramfs,
+        logger, look, losetup, lsblk, lscpu, mcookie, mkfs, mkfs.bfs, mkfs.cramfs,
         mkfs.minix, mkswap, more, mount, namei, partx, pg, pivot_root,
         readprofile, rename, renice, rev, rtcwake, script, scriptreplay,
         setarch, setsid, setterm, sfdisk, swaplabel, swapoff (link to swapon),
@@ -132,7 +132,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>addpart</command></term>
         <listitem>
           <para>Informs the Linux kernel of new partitions</para>
-          <indexterm zone="ch-system-util-linux-ng addpart">
+          <indexterm zone="ch-system-util-linux addpart">
             <primary sortas="b-addpart">addpart</primary>
           </indexterm>
         </listitem>
@@ -143,7 +143,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Opens a tty port, prompts for a login name,
           and then invokes the <command>login</command> program</para>
-          <indexterm zone="ch-system-util-linux-ng agetty">
+          <indexterm zone="ch-system-util-linux agetty">
             <primary sortas="b-agetty">agetty</primary>
           </indexterm>
         </listitem>
@@ -153,7 +153,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>arch</command></term>
         <listitem>
           <para>Reports the machine's architecture</para>
-          <indexterm zone="ch-system-util-linux-ng arch">
+          <indexterm zone="ch-system-util-linux arch">
             <primary sortas="b-arch">arch</primary>
           </indexterm>
         </listitem>
@@ -164,7 +164,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>A command line utility to locate and print block device
           attributes</para>
-          <indexterm zone="ch-system-util-linux-ng blkid">
+          <indexterm zone="ch-system-util-linux blkid">
             <primary sortas="b-blkid">blkid</primary>
           </indexterm>
         </listitem>
@@ -175,7 +175,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Allows users to call block device ioctls from the command
           line</para>
-          <indexterm zone="ch-system-util-linux-ng blockdev">
+          <indexterm zone="ch-system-util-linux blockdev">
             <primary sortas="b-blockdev">blockdev</primary>
           </indexterm>
         </listitem>
@@ -185,7 +185,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>cal</command></term>
         <listitem>
           <para>Displays a simple calendar</para>
-          <indexterm zone="ch-system-util-linux-ng cal">
+          <indexterm zone="ch-system-util-linux cal">
             <primary sortas="b-cal">cal</primary>
           </indexterm>
         </listitem>
@@ -195,7 +195,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>cfdisk</command></term>
         <listitem>
           <para>Manipulates the partition table of the given device</para>
-          <indexterm zone="ch-system-util-linux-ng cfdisk">
+          <indexterm zone="ch-system-util-linux cfdisk">
             <primary sortas="b-cfdisk">cfdisk</primary>
           </indexterm>
         </listitem>
@@ -205,7 +205,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>chkdupexe</command></term>
         <listitem>
           <para>Finds duplicate executables</para>
-          <indexterm zone="ch-system-util-linux-ng chkdupexe">
+          <indexterm zone="ch-system-util-linux chkdupexe">
             <primary sortas="b-chkdupexe">chkdupexe</primary>
           </indexterm>
         </listitem>
@@ -215,7 +215,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>chrt</command></term>
         <listitem>
           <para>Manipulates real-time attributes of a process</para>
-          <indexterm zone="ch-system-util-linux-ng chrt">
+          <indexterm zone="ch-system-util-linux chrt">
             <primary sortas="b-chrt">chrt</primary>
           </indexterm>
         </listitem>
@@ -225,7 +225,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>col</command></term>
         <listitem>
           <para>Filters out reverse line feeds</para>
-          <indexterm zone="ch-system-util-linux-ng col">
+          <indexterm zone="ch-system-util-linux col">
             <primary sortas="b-col">col</primary>
           </indexterm>
         </listitem>
@@ -236,7 +236,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Filters <command>nroff</command> output for terminals
           that lack some capabilities, such as overstriking and half-lines</para>
-          <indexterm zone="ch-system-util-linux-ng colcrt">
+          <indexterm zone="ch-system-util-linux colcrt">
             <primary sortas="b-colcrt">colcrt</primary>
           </indexterm>
         </listitem>
@@ -246,7 +246,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>colrm</command></term>
         <listitem>
           <para>Filters out the given columns</para>
-          <indexterm zone="ch-system-util-linux-ng colrm">
+          <indexterm zone="ch-system-util-linux colrm">
             <primary sortas="b-colrm">colrm</primary>
           </indexterm>
         </listitem>
@@ -256,7 +256,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>column</command></term>
         <listitem>
           <para>Formats a given file into multiple columns</para>
-          <indexterm zone="ch-system-util-linux-ng column">
+          <indexterm zone="ch-system-util-linux column">
             <primary sortas="b-column">column</primary>
           </indexterm>
         </listitem>
@@ -267,7 +267,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Sets the function of the Ctrl+Alt+Del key combination to a
           hard or a soft reset</para>
-          <indexterm zone="ch-system-util-linux-ng ctrlaltdel">
+          <indexterm zone="ch-system-util-linux ctrlaltdel">
             <primary sortas="b-ctrlaltdel">ctrlaltdel</primary>
           </indexterm>
         </listitem>
@@ -278,7 +278,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Tunes the parameters of the serial line drivers for
           Cyclades cards</para>
-          <indexterm zone="ch-system-util-linux-ng cytune">
+          <indexterm zone="ch-system-util-linux cytune">
             <primary sortas="b-cytune">cytune</primary>
           </indexterm>
         </listitem>
@@ -289,7 +289,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Gives the Discordian date or converts the given Gregorian date
           to a Discordian one</para>
-          <indexterm zone="ch-system-util-linux-ng ddate">
+          <indexterm zone="ch-system-util-linux ddate">
             <primary sortas="b-ddate">ddate</primary>
           </indexterm>
         </listitem>
@@ -299,7 +299,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>delpart</command></term>
         <listitem>
           <para>Asks the Linux kernel to remove a partition</para>
-          <indexterm zone="ch-system-util-linux-ng delpart">
+          <indexterm zone="ch-system-util-linux delpart">
             <primary sortas="b-delpart">delpart</primary>
           </indexterm>
         </listitem>
@@ -309,7 +309,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>dmesg</command></term>
         <listitem>
           <para>Dumps the kernel boot messages</para>
-          <indexterm zone="ch-system-util-linux-ng dmesg">
+          <indexterm zone="ch-system-util-linux dmesg">
             <primary sortas="b-dmesg">dmesg</primary>
           </indexterm>
         </listitem>
@@ -319,7 +319,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>fallocate</command></term>
         <listitem>
           <para>Preallocates space to a file</para>
-          <indexterm zone="ch-system-util-linux-ng fallocate">
+          <indexterm zone="ch-system-util-linux fallocate">
             <primary sortas="b-fallocate">fallocate</primary>
           </indexterm>
         </listitem>
@@ -329,7 +329,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>fdformat</command></term>
         <listitem>
           <para>Low-level formats a floppy disk</para>
-          <indexterm zone="ch-system-util-linux-ng fdformat">
+          <indexterm zone="ch-system-util-linux fdformat">
             <primary sortas="b-fdformat">fdformat</primary>
           </indexterm>
         </listitem>
@@ -339,7 +339,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>fdisk</command></term>
         <listitem>
           <para>Manipulates the paritition table of the given device</para>
-          <indexterm zone="ch-system-util-linux-ng fdisk">
+          <indexterm zone="ch-system-util-linux fdisk">
             <primary sortas="b-fdisk">fdisk</primary>
           </indexterm>
         </listitem>
@@ -350,7 +350,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Finds a file system by label or Universally Unique Identifier
           (UUID)</para>
-          <indexterm zone="ch-system-util-linux-ng findfs">
+          <indexterm zone="ch-system-util-linux findfs">
             <primary sortas="b-findfs">findfs</primary>
           </indexterm>
         </listitem>
@@ -361,7 +361,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Is a command line interface to the libmount library 
           for work with mountinfo, fstab and mtab files</para>
-          <indexterm zone="ch-system-util-linux-ng findmnt">
+          <indexterm zone="ch-system-util-linux findmnt">
             <primary sortas="b-findmnt">findmnt</primary>
           </indexterm>
         </listitem>
@@ -372,7 +372,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Acquires a file lock and then executes a command with the lock
           held</para>
-          <indexterm zone="ch-system-util-linux-ng flock">
+          <indexterm zone="ch-system-util-linux flock">
             <primary sortas="b-flock">flock</primary>
           </indexterm>
         </listitem>
@@ -382,7 +382,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>fsck</command></term>
         <listitem>
           <para>Is used to check, and optionally repair, file systems</para>
-          <indexterm zone="ch-system-util-linux-ng fsck">
+          <indexterm zone="ch-system-util-linux fsck">
             <primary sortas="b-fsck">fsck</primary>
           </indexterm>
         </listitem>
@@ -393,7 +393,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Performs a consistency check on the Cramfs file system on the
           given device</para>
-          <indexterm zone="ch-system-util-linux-ng fsck.cramfs">
+          <indexterm zone="ch-system-util-linux fsck.cramfs">
             <primary sortas="b-fsck.cramfs">fsck.cramfs</primary>
           </indexterm>
         </listitem>
@@ -404,7 +404,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Performs a consistency check on the Minix file system on the
           given device</para>
-          <indexterm zone="ch-system-util-linux-ng fsck.minix">
+          <indexterm zone="ch-system-util-linux fsck.minix">
             <primary sortas="b-fsck.minix">fsck.minix</primary>
           </indexterm>
         </listitem>
@@ -415,17 +415,27 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Is a very simple wrapper around FIFREEZE/FITHAW ioctl 
           kernel driver operations</para>
-          <indexterm zone="ch-system-util-linux-ng fsfreeze">
+          <indexterm zone="ch-system-util-linux fsfreeze">
             <primary sortas="b-fsfreeze">fsfreeze</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="fstrim">
+        <term><command>fstrim</command></term>
+        <listitem>
+          <para>Discards unused blocks on a mounted filesystem</para>
+          <indexterm zone="ch-system-util-linux fstrim">
+            <primary sortas="b-fstrim">fstrim</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="getopt">
         <term><command>getopt</command></term>
         <listitem>
           <para>Parses options in the given command line</para>
-          <indexterm zone="ch-system-util-linux-ng getopt">
+          <indexterm zone="ch-system-util-linux getopt">
             <primary sortas="b-getopt">getopt</primary>
           </indexterm>
         </listitem>
@@ -436,7 +446,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Dumps the given file in hexadecimal or in another given
           format</para>
-          <indexterm zone="ch-system-util-linux-ng hexdump">
+          <indexterm zone="ch-system-util-linux hexdump">
             <primary sortas="b-hexdump">hexdump</primary>
           </indexterm>
         </listitem>
@@ -448,7 +458,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
           <para>Reads or sets the system's hardware clock, also called
           the Real-Time Clock (RTC) or Basic Input-Output System (BIOS)
           clock</para>
-          <indexterm zone="ch-system-util-linux-ng hwclock">
+          <indexterm zone="ch-system-util-linux hwclock">
             <primary sortas="b-hwclock">hwclock</primary>
           </indexterm>
         </listitem>
@@ -458,7 +468,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>i386</command></term>
         <listitem>
           <para>A symbolic link to setarch</para>
-          <indexterm zone="ch-system-util-linux-ng i386">
+          <indexterm zone="ch-system-util-linux i386">
             <primary sortas="b-i386">i386</primary>
           </indexterm>
         </listitem>
@@ -468,7 +478,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>ionice</command></term>
         <listitem>
           <para>Gets or sets the io scheduling class and priority for a program</para>
-          <indexterm zone="ch-system-util-linux-ng ionice">
+          <indexterm zone="ch-system-util-linux ionice">
             <primary sortas="b-ionice">ionice</primary>
           </indexterm>
         </listitem>
@@ -478,7 +488,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>ipcmk</command></term>
         <listitem>
           <para>Creates various IPC resources</para>
-          <indexterm zone="ch-system-util-linux-ng ipcmk">
+          <indexterm zone="ch-system-util-linux ipcmk">
             <primary sortas="b-ipcmk">ipcmk</primary>
           </indexterm>
         </listitem>
@@ -488,7 +498,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>ipcrm</command></term>
         <listitem>
           <para>Removes the given Inter-Process Communication (IPC) resource</para>
-          <indexterm zone="ch-system-util-linux-ng ipcrm">
+          <indexterm zone="ch-system-util-linux ipcrm">
             <primary sortas="b-ipcrm">ipcrm</primary>
           </indexterm>
         </listitem>
@@ -498,7 +508,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>ipcs</command></term>
         <listitem>
           <para>Provides IPC status information</para>
-          <indexterm zone="ch-system-util-linux-ng ipcs">
+          <indexterm zone="ch-system-util-linux ipcs">
             <primary sortas="b-ipcs">ipcs</primary>
           </indexterm>
         </listitem>
@@ -508,7 +518,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>isosize</command></term>
         <listitem>
           <para>Reports the size of an iso9660 file system</para>
-          <indexterm zone="ch-system-util-linux-ng isosize">
+          <indexterm zone="ch-system-util-linux isosize">
             <primary sortas="b-isosize">isosize</primary>
           </indexterm>
         </listitem>
@@ -518,7 +528,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>ldattach</command></term>
         <listitem>
           <para>Attaches a line discipline to a serial line</para>
-          <indexterm zone="ch-system-util-linux-ng ldattach">
+          <indexterm zone="ch-system-util-linux ldattach">
             <primary sortas="b-ldattach">ldattach</primary>
           </indexterm>
         </listitem>
@@ -528,7 +538,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>line</command></term>
         <listitem>
           <para>Copies a single line</para>
-          <indexterm zone="ch-system-util-linux-ng line">
+          <indexterm zone="ch-system-util-linux line">
             <primary sortas="b-line">line</primary>
           </indexterm>
         </listitem>
@@ -538,7 +548,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>linux32</command></term>
         <listitem>
           <para>A symbolic link to setarch</para>
-          <indexterm zone="ch-system-util-linux-ng linux32">
+          <indexterm zone="ch-system-util-linux linux32">
             <primary sortas="b-linux32">linux32</primary>
           </indexterm>
         </listitem>
@@ -548,7 +558,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>linux64</command></term>
         <listitem>
           <para>A symbolic link to setarch</para>
-          <indexterm zone="ch-system-util-linux-ng linux64">
+          <indexterm zone="ch-system-util-linux linux64">
             <primary sortas="b-linux64">linux64</primary>
           </indexterm>
         </listitem>
@@ -558,7 +568,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>logger</command></term>
         <listitem>
           <para>Enters the given message into the system log</para>
-          <indexterm zone="ch-system-util-linux-ng logger">
+          <indexterm zone="ch-system-util-linux logger">
             <primary sortas="b-logger">logger</primary>
           </indexterm>
         </listitem>
@@ -568,7 +578,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>look</command></term>
         <listitem>
           <para>Displays lines that begin with the given string</para>
-          <indexterm zone="ch-system-util-linux-ng look">
+          <indexterm zone="ch-system-util-linux look">
             <primary sortas="b-look">look</primary>
           </indexterm>
         </listitem>
@@ -578,17 +588,28 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>losetup</command></term>
         <listitem>
           <para>Sets up and controls loop devices</para>
-          <indexterm zone="ch-system-util-linux-ng losetup">
+          <indexterm zone="ch-system-util-linux losetup">
             <primary sortas="b-losetup">losetup</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="lsblk">
+        <term><command>lsblk</command></term>
+        <listitem>
+          <para>Lists information about all or selected block devices in
+           a tree-like format.</para>
+          <indexterm zone="ch-system-util-linux lsblk">
+            <primary sortas="b-lsblk">lsblk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="lscpu">
         <term><command>lscpu</command></term>
         <listitem>
           <para>Prints CPU architechture information</para>
-          <indexterm zone="ch-system-util-linux-ng lscpu">
+          <indexterm zone="ch-system-util-linux lscpu">
             <primary sortas="b-lscpu">lscpu</primary>
           </indexterm>
         </listitem>
@@ -599,7 +620,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Generates magic cookies (128-bit random hexadecimal numbers) for
           <command>xauth</command></para>
-          <indexterm zone="ch-system-util-linux-ng mcookie">
+          <indexterm zone="ch-system-util-linux mcookie">
             <primary sortas="b-mcookie">mcookie</primary>
           </indexterm>
         </listitem>
@@ -610,7 +631,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Builds a file system on a device (usually a hard disk
           partition)</para>
-          <indexterm zone="ch-system-util-linux-ng mkfs">
+          <indexterm zone="ch-system-util-linux mkfs">
             <primary sortas="b-mkfs">mkfs</primary>
           </indexterm>
         </listitem>
@@ -620,7 +641,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>mkfs.bfs</command></term>
         <listitem>
           <para>Creates a Santa Cruz Operations (SCO) bfs file system</para>
-          <indexterm zone="ch-system-util-linux-ng mkfs.bfs">
+          <indexterm zone="ch-system-util-linux mkfs.bfs">
             <primary sortas="b-mkfs.bfs">mkfs.bfs</primary>
           </indexterm>
         </listitem>
@@ -630,7 +651,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>mkfs.cramfs</command></term>
         <listitem>
           <para>Creates a cramfs file system</para>
-          <indexterm zone="ch-system-util-linux-ng mkfs.cramfs">
+          <indexterm zone="ch-system-util-linux mkfs.cramfs">
             <primary sortas="b-mkfs.cramfs">mkfs.cramfs</primary>
           </indexterm>
         </listitem>
@@ -640,7 +661,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>mkfs.minix</command></term>
         <listitem>
           <para>Creates a Minix file system</para>
-          <indexterm zone="ch-system-util-linux-ng mkfs.minix">
+          <indexterm zone="ch-system-util-linux mkfs.minix">
             <primary sortas="b-mkfs.minix">mkfs.minix</primary>
           </indexterm>
         </listitem>
@@ -651,7 +672,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Initializes the given device or file to be used as a swap
           area</para>
-          <indexterm zone="ch-system-util-linux-ng mkswap">
+          <indexterm zone="ch-system-util-linux mkswap">
             <primary sortas="b-mkswap">mkswap</primary>
           </indexterm>
         </listitem>
@@ -661,7 +682,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>more</command></term>
         <listitem>
           <para>A filter for paging through text one screen at a time</para>
-          <indexterm zone="ch-system-util-linux-ng more">
+          <indexterm zone="ch-system-util-linux more">
             <primary sortas="b-more">more</primary>
           </indexterm>
         </listitem>
@@ -672,7 +693,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Attaches the file system on the given device to a specified
           directory in the file-system tree</para>
-          <indexterm zone="ch-system-util-linux-ng mount">
+          <indexterm zone="ch-system-util-linux mount">
             <primary sortas="b-mount">mount</primary>
           </indexterm>
         </listitem>
@@ -682,7 +703,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>namei</command></term>
         <listitem>
           <para>Shows the symbolic links in the given pathnames</para>
-          <indexterm zone="ch-system-util-linux-ng namei">
+          <indexterm zone="ch-system-util-linux namei">
             <primary sortas="b-namei">namei</primary>
           </indexterm>
         </listitem>
@@ -693,7 +714,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Tells the kernel about the presence and numbering of on-disk
           partitions</para>
-          <indexterm zone="ch-system-util-linux-ng partx">
+          <indexterm zone="ch-system-util-linux partx">
             <primary sortas="b-partx">partx</primary>
           </indexterm>
         </listitem>
@@ -703,7 +724,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>pg</command></term>
         <listitem>
           <para>Displays a text file one screen full at a time</para>
-          <indexterm zone="ch-system-util-linux-ng pg">
+          <indexterm zone="ch-system-util-linux pg">
             <primary sortas="b-pg">pg</primary>
           </indexterm>
         </listitem>
@@ -714,7 +735,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Makes the given file system the new root file system of the
           current process</para>
-          <indexterm zone="ch-system-util-linux-ng pivot_root">
+          <indexterm zone="ch-system-util-linux pivot_root">
             <primary sortas="b-pivot_root">pivot_root</primary>
           </indexterm>
         </listitem>
@@ -724,7 +745,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>readprofile</command></term>
         <listitem>
           <para>Reads kernel profiling information</para>
-          <indexterm zone="ch-system-util-linux-ng readprofile">
+          <indexterm zone="ch-system-util-linux readprofile">
             <primary sortas="b-readprofile">readprofile</primary>
           </indexterm>
         </listitem>
@@ -735,7 +756,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Renames the given files, replacing a given string with
           another</para>
-          <indexterm zone="ch-system-util-linux-ng rename">
+          <indexterm zone="ch-system-util-linux rename">
             <primary sortas="b-rename">rename</primary>
           </indexterm>
         </listitem>
@@ -745,7 +766,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>renice</command></term>
         <listitem>
           <para>Alters the priority of running processes</para>
-          <indexterm zone="ch-system-util-linux-ng renice">
+          <indexterm zone="ch-system-util-linux renice">
             <primary sortas="b-renice">renice</primary>
           </indexterm>
         </listitem>
@@ -755,7 +776,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>rev</command></term>
         <listitem>
           <para>Reverses the lines of a given file</para>
-          <indexterm zone="ch-system-util-linux-ng rev">
+          <indexterm zone="ch-system-util-linux rev">
             <primary sortas="b-rev">rev</primary>
           </indexterm>
         </listitem>
@@ -766,7 +787,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Used to enter a system sleep state until specified wakeup
           time</para>
-          <indexterm zone="ch-system-util-linux-ng rtcwake">
+          <indexterm zone="ch-system-util-linux rtcwake">
             <primary sortas="b-rtcwake">rtcwake</primary>
           </indexterm>
         </listitem>
@@ -776,7 +797,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>script</command></term>
         <listitem>
           <para>Makes a typescript of a terminal session</para>
-          <indexterm zone="ch-system-util-linux-ng script">
+          <indexterm zone="ch-system-util-linux script">
             <primary sortas="b-script">script</primary>
           </indexterm>
         </listitem>
@@ -786,7 +807,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>scriptreplay</command></term>
         <listitem>
           <para>Plays back typescripts using timing information</para>
-          <indexterm zone="ch-system-util-linux-ng scriptreplay">
+          <indexterm zone="ch-system-util-linux scriptreplay">
             <primary sortas="b-scriptreplay">scriptreplay</primary>
           </indexterm>
         </listitem>
@@ -797,7 +818,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Changes reported architecture in a new program environment and
           sets personality flags</para>
-          <indexterm zone="ch-system-util-linux-ng setarch">
+          <indexterm zone="ch-system-util-linux setarch">
             <primary sortas="b-setarch">setarch</primary>
           </indexterm>
         </listitem>
@@ -807,7 +828,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>setsid</command></term>
         <listitem>
           <para>Runs the given program in a new session</para>
-          <indexterm zone="ch-system-util-linux-ng setsid">
+          <indexterm zone="ch-system-util-linux setsid">
             <primary sortas="b-setsid">setsid</primary>
           </indexterm>
         </listitem>
@@ -817,7 +838,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>setterm</command></term>
         <listitem>
           <para>Sets terminal attributes</para>
-          <indexterm zone="ch-system-util-linux-ng setterm">
+          <indexterm zone="ch-system-util-linux setterm">
             <primary sortas="b-setterm">setterm</primary>
           </indexterm>
         </listitem>
@@ -827,7 +848,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>sfdisk</command></term>
         <listitem>
           <para>A disk partition table manipulator</para>
-          <indexterm zone="ch-system-util-linux-ng sfdisk">
+          <indexterm zone="ch-system-util-linux sfdisk">
             <primary sortas="b-sfdisk">sfdisk</primary>
           </indexterm>
         </listitem>
@@ -837,7 +858,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>swaplabel</command></term>
         <listitem>
           <para>Allows to change swaparea UUID and label</para>
-          <indexterm zone="ch-system-util-linux-ng swaplabel">
+          <indexterm zone="ch-system-util-linux swaplabel">
             <primary sortas="b-swaplabel">swaplabel</primary>
           </indexterm>
         </listitem>
@@ -847,7 +868,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>swapoff</command></term>
         <listitem>
           <para>Disables devices and files for paging and swapping</para>
-          <indexterm zone="ch-system-util-linux-ng swapoff">
+          <indexterm zone="ch-system-util-linux swapoff">
             <primary sortas="b-swapoff">swapoff</primary>
           </indexterm>
         </listitem>
@@ -858,7 +879,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Enables devices and files for paging and swapping and
           lists the devices and files currently in use</para>
-          <indexterm zone="ch-system-util-linux-ng swapon">
+          <indexterm zone="ch-system-util-linux swapon">
             <primary sortas="b-swapon">swapon</primary>
           </indexterm>
         </listitem>
@@ -868,7 +889,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>switch_root</command></term>
         <listitem>
           <para>Switches to another filesystem as the root of the mount tree</para>
-          <indexterm zone="ch-system-util-linux-ng switch_root">
+          <indexterm zone="ch-system-util-linux switch_root">
             <primary sortas="b-switch_root">switch_root</primary>
           </indexterm>
         </listitem>
@@ -880,7 +901,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
           <para>Tracks the growth of a log file. Displays the last 10 lines
           of a log file, then continues displaying any new entries in the
           log file as they are created</para>
-          <indexterm zone="ch-system-util-linux-ng tailf">
+          <indexterm zone="ch-system-util-linux tailf">
             <primary sortas="b-tailf">tailf</primary>
           </indexterm>
         </listitem>
@@ -890,7 +911,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>taskset</command></term>
         <listitem>
           <para>Retrieves or sets a process' CPU affinity</para>
-          <indexterm zone="ch-system-util-linux-ng taskset">
+          <indexterm zone="ch-system-util-linux taskset">
             <primary sortas="b-taskset">taskset</primary>
           </indexterm>
         </listitem>
@@ -900,7 +921,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>tunelp</command></term>
         <listitem>
           <para>Tunes the parameters of the line printer</para>
-          <indexterm zone="ch-system-util-linux-ng tunelp">
+          <indexterm zone="ch-system-util-linux tunelp">
             <primary sortas="b-tunelp">tunelp</primary>
           </indexterm>
         </listitem>
@@ -911,7 +932,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>A filter for translating underscores into escape sequences
           indicating underlining for the terminal in use</para>
-          <indexterm zone="ch-system-util-linux-ng ul">
+          <indexterm zone="ch-system-util-linux ul">
             <primary sortas="b-ul">ul</primary>
           </indexterm>
         </listitem>
@@ -921,7 +942,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>umount</command></term>
         <listitem>
           <para>Disconnects a file system from the system's file tree</para>
-          <indexterm zone="ch-system-util-linux-ng umount">
+          <indexterm zone="ch-system-util-linux umount">
             <primary sortas="b-umount">umount</primary>
           </indexterm>
         </listitem>
@@ -931,7 +952,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>unshare</command></term>
         <listitem>
           <para>Runs a program with some namespaces unshared from parent</para>
-          <indexterm zone="ch-system-util-linux-ng unshare">
+          <indexterm zone="ch-system-util-linux unshare">
             <primary sortas="b-unshare">unshare</primary>
           </indexterm>
         </listitem>
@@ -942,7 +963,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>A daemon used by the UUID library to generate time-based
           UUIDs in a secure and guranteed-unique fashion.</para>
-          <indexterm zone="ch-system-util-linux-ng uuidd">
+          <indexterm zone="ch-system-util-linux uuidd">
             <primary sortas="b-uuidd">uuidd</primary>
           </indexterm>
         </listitem>
@@ -954,7 +975,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
           <para>Creates new UUIDs. Each new UUID can reasonably be considered
           unique among all UUIDs created, on the local system and on other
           systems, in the past and in the future</para>
-          <indexterm zone="ch-system-util-linux-ng uuidgen">
+          <indexterm zone="ch-system-util-linux uuidgen">
             <primary sortas="b-uuidgen">uuidgen</primary>
           </indexterm>
         </listitem>
@@ -965,7 +986,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Displays the contents of a file or, by default, its standard
           input, on the terminals of all currently logged in users</para>
-          <indexterm zone="ch-system-util-linux-ng wall">
+          <indexterm zone="ch-system-util-linux wall">
             <primary sortas="b-wall">wall</primary>
           </indexterm>
         </listitem>
@@ -976,7 +997,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Reports the location of the binary, source, and man page
           for the given command</para>
-          <indexterm zone="ch-system-util-linux-ng whereis">
+          <indexterm zone="ch-system-util-linux whereis">
             <primary sortas="b-whereis">whereis</primary>
           </indexterm>
         </listitem>
@@ -986,7 +1007,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <term><command>wipefs</command></term>
         <listitem>
           <para>Wipes a filesystem signature from a device</para>
-          <indexterm zone="ch-system-util-linux-ng wipefs">
+          <indexterm zone="ch-system-util-linux wipefs">
             <primary sortas="b-wipefs">wipefs</primary>
           </indexterm>
         </listitem>
@@ -997,7 +1018,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Sends a message to the given user <emphasis>if</emphasis> that
           user has not disabled receipt of such messages</para>
-          <indexterm zone="ch-system-util-linux-ng write">
+          <indexterm zone="ch-system-util-linux write">
             <primary sortas="b-write">write</primary>
           </indexterm>
         </listitem>
@@ -1008,7 +1029,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Contains routines for device identification and token
           extraction</para>
-          <indexterm zone="ch-system-util-linux-ng libblkid">
+          <indexterm zone="ch-system-util-linux libblkid">
             <primary sortas="c-libblkid">libblkid</primary>
           </indexterm>
         </listitem>
@@ -1019,7 +1040,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         <listitem>
           <para>Contains routines for generating unique identifiers for objects
           that may be accessible beyond the local system</para>
-          <indexterm zone="ch-system-util-linux-ng libuuid">
+          <indexterm zone="ch-system-util-linux libuuid">
             <primary sortas="c-libuuid">libuuid</primary>
           </indexterm>
         </listitem>
diff --git a/general.ent b/general.ent
index 6648d1514..41f3575cc 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20110204">
-<!ENTITY releasedate "February 4, 2011">
+<!ENTITY version "SVN-20110210">
+<!ENTITY releasedate "February 10, 2011">
 <!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "6.8">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 42a7e3b7a..c08e1fd69 100644
--- a/packages.ent
+++ b/packages.ent
@@ -533,15 +533,15 @@
 <!ENTITY udev-config-md5 "UDEV-MD5SUM">      <!-- Updated in Makefile -->
 <!ENTITY udev-config-home " ">
 
-<!ENTITY util-linux-ng-version "2.18">
-<!ENTITY util-linux-ng-size "7,490 KB">
-<!ENTITY util-linux-ng-url "&kernel;linux/utils/util-linux-ng/v2.18/util-linux-ng-&util-linux-ng-version;.tar.bz2">
-<!ENTITY util-linux-ng-md5 "2f5f71e6af969d041d73ab778c141a77">
-<!ENTITY util-linux-ng-home "http://userweb.kernel.org/~kzak/util-linux-ng/">
-<!--<!ENTITY util-linux-ng-ch5-du "19 MB">-->
-<!--<!ENTITY util-linux-ng-ch5-sbu "0.1 SBU">-->
-<!ENTITY util-linux-ng-ch6-du "49 MB">
-<!ENTITY util-linux-ng-ch6-sbu "0.6 SBU">
+<!ENTITY util-linux-version "2.19">
+<!ENTITY util-linux-size "4,288 KB">
+<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-version;/util-linux-&util-linux-version;.tar.bz2">
+<!ENTITY util-linux-md5 "590ca71aad0b254e2631d84401f28255">
+<!ENTITY util-linux-home "http://userweb.kernel.org/~kzak/util-linux/">
+<!--<!ENTITY util-linux-ch5-du "19 MB">-->
+<!--<!ENTITY util-linux-ch5-sbu "0.1 SBU">-->
+<!ENTITY util-linux-ch6-du "50 MB">
+<!ENTITY util-linux-ch6-sbu "0.6 SBU">
 
 <!ENTITY vim-version "7.3">
 <!ENTITY vim-docdir "vim/vim73">
diff --git a/prologue/standards.xml b/prologue/standards.xml
index a31755682..4e42dc4de 100644
--- a/prologue/standards.xml
+++ b/prologue/standards.xml
@@ -62,7 +62,7 @@
         <listitem>
           <para>Bash, Binutils, Coreutils, Diffutils, File, Findutils, Gawk,
                 Grep, Gzip, M4, Man-DB, Ncurses, Procps, Psmisc, Sed,
-                Shadow, Tar, Util-linux-ng, Zlib</para>
+                Shadow, Tar, Util-linux, Zlib</para>
         </listitem>
       </varlistentry>
 
diff --git a/prologue/why.xml b/prologue/why.xml
index 5391a8a10..8c6ae0e10 100644
--- a/prologue/why.xml
+++ b/prologue/why.xml
@@ -430,7 +430,7 @@
       </listitem>
 
       <listitem>
-        <para>Util-linux-ng</para>
+        <para>Util-linux</para>
 
         <para>This package contains miscellaneous utility programs. 
         Among them are utilities for handling file systems, consoles,