The invention relates to a novel cosmetic composition, containing, in a cosmetically acceptable medium, at least one hair conditioning agent and at least one aqueous dispersion of pre-cross-linked organopolysiloxanes composed of units of general formula (I), wherein R means a monovalent, saturated or unsaturated hydrocarbon group having 1 to 200 carbon atoms per group, which hydrocarbon group can contain one or more heteroatoms from the group N, P, S, O, and halogen, R1 means a hydrogen atom or an alkyl group having 1 to 8 carbon atoms per group, R2 means a monovalent, optionally substituted hydrocarbon group having 1 to 18 carbon atoms per group, AKT is a group of the formula —CH2NHR4, —CH2NR42, or formula (II), wherein R4 means a monovalent hydrocarbon group having 1 to 18 carbon atoms, which hydrocarbon group can contain one or more heteroatoms from the group N and O, and R5 means a divalent hydrocarbon group having 3 to 12 carbon atoms, which hydrocarbon group can contain one or more heteroatoms from the group N and O, b is 0.1 or 2, c is 0.1, 2, or 3, d is 0.1 or 2, and n is 0.1 or 2, with the stipulation that the sum n+b+c+d is ≦3, that at least one AKT group is contained per molecule on average, and that the organopolysiloxanes preferably form elastomeric films after the water is removed.AKTnRb2Rc(OR1)SiO4-(n+b+c+d)2d(I)
