map spec to unf5/6 (#2) (closes #6 #7)