Support packaging w/ XP <5.9 and XP >= 5.9

Possible implementation fix for issue #14 .