Apply patch by Lupe Christoph for 98-clean-chroot