Add from main trunk. Will be needed for make install.