SPPP: use latest sources provided by Bjorn (with extra patch)