amami: paranoidify and add additional-files