Fixup and move passwd and group to passwd.dist and group.dist