SPPP: use latest sources provided by Bjorn