Upstream for Fedora's goobox package