In this paper, we propose a reassessment of Wolof noun morphology and morphosyntax. Wolof is usually said to possess a total of 10 noun classes (8 for the singular, 2 for the plural), marked today exclusively on agreement targets. We provide evidence that two more plural noun classes must be recognized, which have so far been misinterpreted as “collective” rather than plural: the evidence we provide is morphosyntactic (from verb agreement) as well as morphological (from class-related asymmetries in the paradigm of the indefinite article). As for method, the main thrust of the paper consists in showing that an accurate analysis of the Wolof data must make use of the three distinct notions “noun class”, “inflectional class” and “agreement class” (or gender). Under the analysis defended here, Wolof turns out to have a fairly complex gender system, featuring 17 distinct gender values. Our analysis – and especially the discussion of Wolof so-called “collectives” – also bears on the general theoretical issue of how to establish the values of the number category.