Port 96630c7 to makexpi.sh