Update from 4.17 (2006) to 5.5 (2009)