[3.8] Pimp file serve contrib