Converting a pre-image resistant hash to second pre-image resistant
Yes. ​ I believe this is the standard conversion.

(That link is to the paper "Universal One-Way Hash Functions via Inaccessible Entropy".)