Updated to work with current rpi-update.