Issue #264 - Distribution preparation