Merged from mwolson@gnu.org--2006 (patch 165-170)