added non-free and contrib sections.