Applied patch from Mark Ferrell <mferrell@mvista.com> to use the 'p' option in