Log Message:
marco: add two upstream bug fixes

These haven't made it to a branch yet, but have been carried elsewhere,
e.g., Fedora applied them two months ago.