The growth of plants, algae and cyanobacteria relies on the catalytic activity of the oxygen-evolving photosystem two (PSII) complex which uses solar energy to extract electrons from water to feed into the photosynthetic electron transport chain. PSII is proving to be an excellent system to study how large multi-subunit membrane-protein complexes are assembled in the thylakoid membrane and subsequently repaired in response to photooxidative damage. Here we summarize recent developments in understanding the biogenesis of PSII, with an emphasis on recent insights obtained from biochemical and structural analysis of cyanobacterial PSII assembly/repair intermediates. We also discuss how chlorophyll synthesis is synchronized with protein synthesis and suggest a possible role for photosystem I in PSII assembly. Special attention is paid to unresolved and controversial issues that could be addressed in future research.