Massage the upstream patch for Debian sid