Including Karsten's patch to fix make create-snapshot.