Fix zip creation.
rebase of jburel's d2b7c42