The present invention relates to an amino-functional polysiloxane of formula (1) where each R1 is independently selected from alkyl or aryl radicals, each R2 is independently selected from hydrogen, alkyl or aryl radicals, n is selected so that the molecular weight for the functional polysiloxane is in the range of from 400 to 10,000 and R3 is a bivalent radical or —O—R3—NH—R5 is hydroxy or alkoxy, and R5 is selected from hydrogen, aminoalkyl, aminoalkenyl, aminoaryl, aminocycloalkyl radical, optionally substituted by alkyl, aryl, cycloalkyl, halogen, hydroxy, alkoxy, thioalkyl, amino, amino derivatives, amido, amidoxy, nitro, cyano, keto, acyl derivatives, acyloxy derivatives, carboxy, ester, ether, esteroxy, heterocycle, alkenyl or alkynyl and where 0 to 90% of —O—R3—NH—R5 is hydroxy or alkoxy. The present invention further relates to an epoxy-polysiloxane composition which includes an aminopolysiloxane hardener component or an amino-functional polysiloxane hardener component of formula (1), having active hydrogens able to react with epoxy groups in an epoxy resin to form epoxy polymers, and able to react with a polysiloxane to form polysiloxane polymers, wherein the epoxy chain polymers and polysiloxane polymers polymerize to form a cured epoxy-polysiloxane polymer composition.