updated: spec aligned with latest upstream.