Added contrib and non-free just in case.