Actually being Polish I can say it is correct, at least for the cases mentioned (also correct for suffix -cki). However it is true that there are surnames that do not follow this particular inflection scheme.
Keep in mind that Poles are likely to use a single, male variant of the surname, rather than explain the intricacies of inflection in the Polish language.