[4053] Buildout

Fixed. Please review.