CTAN has a new package: subfig