The invention relates to a light-source assembly, comprising at least one laser light source, a photoluminescence element, which is designed in such a way that, as the result of incident laser light, a mixed light distribution can be emitted by using photoluminescence and which is arranged in such a way that the laser light of the at least one laser light source can be radiated onto the photoluminescence element, and at least one light-emitting diode for emitting a supplemental light distribution, wherein the at least one laser light source, the photoluminescence element, and the at least one light-emitting diode are fastened to a common carrier component as an assembly. The invention further relates to a motor vehicle headlamp having such a light-source assembly.