Ported form trink the appliccable changes in revisions r4896 to r4919.
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multi-arch/BOOK@4926 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689