Upstream 1.20 with a twist
    
    This is what happens when I drop the ball on upstream reviews:
    a Debian guy puts an ugly workaround for Debian brokenness that
    blows up elsewhere. Then we add a workaround for his workaround.
    
    This stuff is to be undone in the next upstream relaase hopefuly.
    Working on it.